diff options
| author | Patrick McHardy <kaber@trash.net> | 2005-06-28 16:04:44 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-06-28 16:04:44 -0700 |
| commit | 9666dae51013b064e7d77fc36b5cee98dd167ed5 (patch) | |
| tree | beb8d20173ecdc5c60906c8fcac8346894673a4c /net/bridge | |
| parent | bcd61272db5e643b6d9c01c9d5085b914d9f19df (diff) | |
| download | linux-9666dae51013b064e7d77fc36b5cee98dd167ed5.tar.gz linux-9666dae51013b064e7d77fc36b5cee98dd167ed5.tar.bz2 linux-9666dae51013b064e7d77fc36b5cee98dd167ed5.zip | |
[NETFILTER]: Fix connection tracking bug in 2.6.12
In 2.6.12 we started dropping the conntrack reference when a packet
leaves the IP layer. This broke connection tracking on a bridge,
because bridge-netfilter defers calling some NF_IP_* hooks to the bridge
layer for locally generated packets going out a bridge, where the
conntrack reference is no longer available. This patch keeps the
reference in this case as a temporary solution, long term we will
remove the defered hook calling. No attempt is made to drop the
reference in the bridge-code when it is no longer needed, tc actions
could already have sent the packet anywhere.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_netfilter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index 03ae4edddac3..2d52fee63a8c 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c @@ -844,7 +844,7 @@ static unsigned int ip_sabotage_out(unsigned int hook, struct sk_buff **pskb, * doesn't use the bridge parent of the indev by using * the BRNF_DONT_TAKE_PARENT mask. */ if (hook == NF_IP_FORWARD && nf_bridge->physindev == NULL) { - nf_bridge->mask &= BRNF_DONT_TAKE_PARENT; + nf_bridge->mask |= BRNF_DONT_TAKE_PARENT; nf_bridge->physindev = (struct net_device *)in; } #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) |