diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2011-05-13 22:03:24 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-13 22:03:24 +0200 |
| commit | cb68552858c64db302771469b1202ea09e696329 (patch) | |
| tree | f7a5f943a151b0bcde920b9aad1938e245c7c5d0 /net/bridge | |
| parent | bonding,llc: Fix structure sizeof incompatibility for some PDUs (diff) | |
| download | linux-cb68552858c64db302771469b1202ea09e696329.tar.xz linux-cb68552858c64db302771469b1202ea09e696329.zip | |
bridge: fix forwarding of IPv6
The commit 6b1e960fdbd75dcd9bcc3ba5ff8898ff1ad30b6e
bridge: Reset IPCB when entering IP stack on NF_FORWARD
broke forwarding of IPV6 packets in bridge because it would
call bp_parse_ip_options with an IPV6 packet.
Reported-by: Noah Meyerhans <noahm@debian.org>
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Reviewed-by: Eric Dumazet <eric.dumazet@gmail.com>
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 f3bc322c5891..74ef4d4846a4 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c @@ -737,7 +737,7 @@ static unsigned int br_nf_forward_ip(unsigned int hook, struct sk_buff *skb, nf_bridge->mask |= BRNF_PKT_TYPE; } - if (br_parse_ip_options(skb)) + if (pf == PF_INET && br_parse_ip_options(skb)) return NF_DROP; /* The physdev module checks on this */ |