| 1 | --- a/include/linux/netdevice.h |
| 2 | +++ b/include/linux/netdevice.h |
| 3 | @@ -445,16 +445,12 @@ struct net_device |
| 4 | /* bridge stuff */ |
| 5 | struct net_bridge_port *br_port; |
| 6 | |
| 7 | -#ifdef CONFIG_NET_FASTROUTE |
| 8 | #define NETDEV_FASTROUTE_HMASK 0xF |
| 9 | /* Semi-private data. Keep it at the end of device struct. */ |
| 10 | rwlock_t fastpath_lock; |
| 11 | struct dst_entry *fastpath[NETDEV_FASTROUTE_HMASK+1]; |
| 12 | -#endif |
| 13 | -#ifdef CONFIG_NET_DIVERT |
| 14 | /* this will get initialized at each interface type init routine */ |
| 15 | struct divert_blk *divert; |
| 16 | -#endif /* CONFIG_NET_DIVERT */ |
| 17 | }; |
| 18 | |
| 19 | /* 2.6 compatibility */ |
| 20 | --- a/include/linux/skbuff.h |
| 21 | +++ b/include/linux/skbuff.h |
| 22 | @@ -83,7 +83,6 @@ |
| 23 | #define NET_CALLER(arg) __builtin_return_address(0) |
| 24 | #endif |
| 25 | |
| 26 | -#ifdef CONFIG_NETFILTER |
| 27 | struct nf_conntrack { |
| 28 | atomic_t use; |
| 29 | void (*destroy)(struct nf_conntrack *); |
| 30 | @@ -92,7 +91,6 @@ struct nf_conntrack { |
| 31 | struct nf_ct_info { |
| 32 | struct nf_conntrack *master; |
| 33 | }; |
| 34 | -#endif |
| 35 | #if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) |
| 36 | struct nf_info; |
| 37 | #endif |
| 38 | @@ -201,7 +199,6 @@ struct sk_buff { |
| 39 | unsigned char *end; /* End pointer */ |
| 40 | |
| 41 | void (*destructor)(struct sk_buff *); /* Destruct function */ |
| 42 | -#ifdef CONFIG_NETFILTER |
| 43 | /* Can be used for communication between hooks. */ |
| 44 | unsigned long nfmark; |
| 45 | /* Cache info */ |
| 46 | @@ -211,7 +208,6 @@ struct sk_buff { |
| 47 | #ifdef CONFIG_NETFILTER_DEBUG |
| 48 | unsigned int nf_debug; |
| 49 | #endif |
| 50 | -#endif /*CONFIG_NETFILTER*/ |
| 51 | |
| 52 | #if defined(CONFIG_HIPPI) |
| 53 | union{ |
| 54 | @@ -219,12 +215,8 @@ struct sk_buff { |
| 55 | } private; |
| 56 | #endif |
| 57 | |
| 58 | -#ifdef CONFIG_NET_SCHED |
| 59 | __u32 tc_index; /* traffic control index */ |
| 60 | -#endif |
| 61 | -#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) |
| 62 | struct nf_info *nf_info; |
| 63 | -#endif |
| 64 | }; |
| 65 | |
| 66 | #ifdef __KERNEL__ |
| 67 | |
