summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorBernhard Thaler <bernhard.thaler@wvnet.at>2015-08-13 08:58:15 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2015-08-19 21:21:41 +0200
commit18e1db67e93ed75d9dc0d34c8d783ccf10547c2b (patch)
treee1400ac43401b172cf5364615b658d274fac071c /include/net
parentbf798657eb5ba57552096843c315f096fdf9b715 (diff)
downloadop-kernel-dev-18e1db67e93ed75d9dc0d34c8d783ccf10547c2b.zip
op-kernel-dev-18e1db67e93ed75d9dc0d34c8d783ccf10547c2b.tar.gz
netfilter: bridge: fix IPv6 packets not being bridged with CONFIG_IPV6=n
230ac490f7fba introduced a dependency to CONFIG_IPV6 which breaks bridging of IPv6 packets on a bridge with CONFIG_IPV6=n. Sysctl entry /proc/sys/net/bridge/bridge-nf-call-ip6tables defaults to 1, for this reason packets are handled by br_nf_pre_routing_ipv6(). When compiled with CONFIG_IPV6=n this function returns NF_DROP but should return NF_ACCEPT to let packets through. Change CONFIG_IPV6=n br_nf_pre_routing_ipv6() return value to NF_ACCEPT. Tested with a simple bridge with two interfaces and IPv6 packets trying to pass from host on left side to host on right side of the bridge. Fixes: 230ac490f7fba ("netfilter: bridge: split ipv6 code into separated file") Signed-off-by: Bernhard Thaler <bernhard.thaler@wvnet.at> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/netfilter/br_netfilter.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/netfilter/br_netfilter.h b/include/net/netfilter/br_netfilter.h
index bab824b..d4c6b5f 100644
--- a/include/net/netfilter/br_netfilter.h
+++ b/include/net/netfilter/br_netfilter.h
@@ -59,7 +59,7 @@ static inline unsigned int
br_nf_pre_routing_ipv6(const struct nf_hook_ops *ops, struct sk_buff *skb,
const struct nf_hook_state *state)
{
- return NF_DROP;
+ return NF_ACCEPT;
}
#endif
OpenPOWER on IntegriCloud