net: make struct tun_struct private to tun.c

There's no reason for this to be in the header, and it just hurts
recompile time.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: Max Krasnyanskiy <maxk@qualcomm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Rusty Russell 2008-04-12 18:48:58 -07:00 committed by David S. Miller
parent a40a7d15ba
commit 14daa02139
3 changed files with 34 additions and 40 deletions

View File

@ -67,10 +67,43 @@
#include <asm/system.h> #include <asm/system.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
/* Uncomment to enable debugging */
/* #define TUN_DEBUG 1 */
#ifdef TUN_DEBUG #ifdef TUN_DEBUG
static int debug; static int debug;
#define DBG if(tun->debug)printk
#define DBG1 if(debug==2)printk
#else
#define DBG( a... )
#define DBG1( a... )
#endif #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 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
};
/* Network device part of the driver */ /* Network device part of the driver */
static LIST_HEAD(tun_dev_list); static LIST_HEAD(tun_dev_list);

View File

@ -86,6 +86,7 @@ header-y += if_plip.h
header-y += if_ppp.h header-y += if_ppp.h
header-y += if_slip.h header-y += if_slip.h
header-y += if_strip.h header-y += if_strip.h
header-y += if_tun.h
header-y += if_tunnel.h header-y += if_tunnel.h
header-y += in6.h header-y += in6.h
header-y += in_route.h header-y += in_route.h
@ -229,7 +230,6 @@ unifdef-y += if_link.h
unifdef-y += if_pppol2tp.h unifdef-y += if_pppol2tp.h
unifdef-y += if_pppox.h unifdef-y += if_pppox.h
unifdef-y += if_tr.h unifdef-y += if_tr.h
unifdef-y += if_tun.h
unifdef-y += if_vlan.h unifdef-y += if_vlan.h
unifdef-y += if_wanpipe.h unifdef-y += if_wanpipe.h
unifdef-y += igmp.h unifdef-y += igmp.h

View File

@ -18,47 +18,8 @@
#ifndef __IF_TUN_H #ifndef __IF_TUN_H
#define __IF_TUN_H #define __IF_TUN_H
/* Uncomment to enable debugging */
/* #define TUN_DEBUG 1 */
#include <linux/types.h> #include <linux/types.h>
#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 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__ */
/* Read queue size */ /* Read queue size */
#define TUN_READQ_SIZE 500 #define TUN_READQ_SIZE 500