summaryrefslogtreecommitdiffstats
path: root/br-nf-bds/linux2.5/include
diff options
context:
space:
mode:
Diffstat (limited to 'br-nf-bds/linux2.5/include')
-rw-r--r--br-nf-bds/linux2.5/include/linux/netfilter.h2
-rw-r--r--br-nf-bds/linux2.5/include/linux/skbuff.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/br-nf-bds/linux2.5/include/linux/netfilter.h b/br-nf-bds/linux2.5/include/linux/netfilter.h
index b2df329..b1ae544 100644
--- a/br-nf-bds/linux2.5/include/linux/netfilter.h
+++ b/br-nf-bds/linux2.5/include/linux/netfilter.h
@@ -118,7 +118,7 @@ extern struct list_head nf_hooks[NPROTO][NF_MAX_HOOKS];
call in fast path: gcc doesn't inline (needs value tracking?). --RR */
#ifdef CONFIG_NETFILTER_DEBUG
#define NF_HOOK(pf, hook, skb, indev, outdev, okfn) \
- nf_hook_slow((pf), (hook), (skb), (indev), (outdev), (okfn), INT_MIN)
+ nf_hook_slow((pf), (hook), (skb), (indev), (outdev), (okfn), INT_MIN)
#define NF_HOOK_THRESH nf_hook_slow
#else
#define NF_HOOK(pf, hook, skb, indev, outdev, okfn) \
diff --git a/br-nf-bds/linux2.5/include/linux/skbuff.h b/br-nf-bds/linux2.5/include/linux/skbuff.h
index fb99584..f1efc36 100644
--- a/br-nf-bds/linux2.5/include/linux/skbuff.h
+++ b/br-nf-bds/linux2.5/include/linux/skbuff.h
@@ -177,8 +177,10 @@ struct sk_buff {
struct sock *sk;
struct timeval stamp;
struct net_device *dev;
+#ifdef CONFIG_BRIDGE_NF
struct net_device *physindev;
struct net_device *physoutdev;
+#endif
union {
struct tcphdr *th;