net: make struct tun_struct private to tun.c

[pandora-kernel.git] / include / linux / if_tun.h

diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h
index 42eb694..8c71fe2 100644 (file)
--- a/include/linux/if_tun.h
+++ b/include/linux/if_tun.h
@@ -18,45 +18,7 @@
 #ifndef __IF_TUN_H
 #define __IF_TUN_H
 
-/* Uncomment to enable debugging */
-/* #define TUN_DEBUG 1 */
-
-#ifdef __KERNEL__
-
-#ifdef TUN_DEBUG
-#define DBG  if(tun->debug)printk
-#define DBG1 if(debug==2)printk
-#else
-#define DBG( a... )
-#define DBG1( a... )
-#endif
-
-struct tun_struct {
-       struct list_head        list;
-       unsigned long           flags;
-       int                     attached;
-       uid_t                   owner;
-       gid_t                   group;
-
-       wait_queue_head_t       read_wait;
-       struct sk_buff_head     readq;
-
-       struct net_device       *dev;
-       struct net_device_stats stats;
-
-       struct fasync_struct    *fasync;
-
-       unsigned long if_flags;
-       u8 dev_addr[ETH_ALEN];
-       u32 chr_filter[2];
-       u32 net_filter[2];
-
-#ifdef TUN_DEBUG       
-       int debug;
-#endif  
-};
-
-#endif /* __KERNEL__ */
+#include <linux/types.h>
 
 /* Read queue size */
 #define TUN_READQ_SIZE 500
@@ -89,7 +51,7 @@ struct tun_struct {
 
 struct tun_pi {
        unsigned short flags;
-       unsigned short proto;
+       __be16 proto;
 };
 #define TUN_PKT_STRIP  0x0001