diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-26 10:22:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-26 10:22:10 -0400 |
| commit | 761a126017e3f001d3f5a574787aa232a9cd5bb5 (patch) | |
| tree | d25d641cd32259a0e891ce2524c1e15f3d71ba40 /include | |
| parent | 153d7f3fcae7ed4e19328549aa9467acdfbced10 (diff) | |
| parent | f59fc7f30b710d45aadf715460b3e60dbe9d3418 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[IPV4/IPV6]: Setting 0 for unused port field in RAW IP recvmsg().
[IPV4] ipmr: ip multicast route bug fix.
[TG3]: Update version and reldate
[TG3]: Handle tg3_init_rings() failures
[TG3]: Add tg3_restart_hw()
[IPV4]: Clear the whole IPCB, this clears also IPCB(skb)->flags.
[IPV6]: Clean skb cb on IPv6 input.
[NETFILTER]: Demote xt_sctp to EXPERIMENTAL
[NETFILTER]: bridge netfilter: add deferred output hooks to feature-removal-schedule
[NETFILTER]: xt_pkttype: fix mismatches on locally generated packets
[NETFILTER]: SNMP NAT: fix byteorder confusion
[NETFILTER]: conntrack: fix SYSCTL=n compile
[NETFILTER]: nf_queue: handle NF_STOP and unknown verdicts in nf_reinject
[NETFILTER]: H.323 helper: fix possible NULL-ptr dereference
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netfilter_bridge.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/netfilter_bridge.h b/include/linux/netfilter_bridge.h index 87764022cc67..31f02ba036ce 100644 --- a/include/linux/netfilter_bridge.h +++ b/include/linux/netfilter_bridge.h | |||
| @@ -79,6 +79,8 @@ struct bridge_skb_cb { | |||
| 79 | __u32 ipv4; | 79 | __u32 ipv4; |
| 80 | } daddr; | 80 | } daddr; |
| 81 | }; | 81 | }; |
| 82 | |||
| 83 | extern int brnf_deferred_hooks; | ||
| 82 | #endif /* CONFIG_BRIDGE_NETFILTER */ | 84 | #endif /* CONFIG_BRIDGE_NETFILTER */ |
| 83 | 85 | ||
| 84 | #endif /* __KERNEL__ */ | 86 | #endif /* __KERNEL__ */ |