diff options
| author | Bart De Schuymer <bdschuym@pandora.be> | 2002-08-24 16:23:01 +0000 |
|---|---|---|
| committer | Bart De Schuymer <bdschuym@pandora.be> | 2002-08-24 16:23:01 +0000 |
| commit | c96e724b48fabf7f8e7dcf0f763cde12563fb678 (patch) | |
| tree | da29fd4cb8fa175c35eeba1659f0fe617a505f82 /br-nf-bds/linux/include | |
| parent | 2717b28a97353742f11784c59dd5076639ec83f1 (diff) | |
*** empty log message ***
Diffstat (limited to 'br-nf-bds/linux/include')
| -rw-r--r-- | br-nf-bds/linux/include/linux/netfilter.h | 2 | ||||
| -rw-r--r-- | br-nf-bds/linux/include/linux/skbuff.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/br-nf-bds/linux/include/linux/netfilter.h b/br-nf-bds/linux/include/linux/netfilter.h index eb1adc6..3ae5a64 100644 --- a/br-nf-bds/linux/include/linux/netfilter.h +++ b/br-nf-bds/linux/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/linux/include/linux/skbuff.h b/br-nf-bds/linux/include/linux/skbuff.h index 257b586..5a6ce25 100644 --- a/br-nf-bds/linux/include/linux/skbuff.h +++ b/br-nf-bds/linux/include/linux/skbuff.h @@ -135,8 +135,10 @@ struct sk_buff { struct sock *sk; /* Socket we are owned by */ struct timeval stamp; /* Time we arrived */ struct net_device *dev; /* Device we arrived on/are leaving by */ +#ifdef CONFIG_BRIDGE_NF struct net_device *physindev; /* Physical device we arrived on */ struct net_device *physoutdev; /* Physical device we will leave by */ +#endif /* Transport layer header */ union |