Commit c9bb6165 authored May 31, 2019 by Pablo Neira Ayuso Committed by David S. Miller May 31, 2019

netfilter: nf_conntrack_bridge: fix CONFIG_IPV6=y



This patch fixes a few problems with CONFIG_IPV6=y and
CONFIG_NF_CONNTRACK_BRIDGE=m:

In file included from net/netfilter/utils.c:5:
include/linux/netfilter_ipv6.h: In function 'nf_ipv6_br_defrag':
include/linux/netfilter_ipv6.h:110:9: error: implicit declaration of function 'nf_ct_frag6_gather'; did you mean 'nf_ct_attach'? [-Werror=implicit-function-declaration]

And these too:

net/ipv6/netfilter.c:242:2: error: unknown field 'br_defrag' specified in initializer
net/ipv6/netfilter.c:243:2: error: unknown field 'br_fragment' specified in initializer

This patch includes an original chunk from wenxu.

Fixes: 764dd163 ("netfilter: nf_conntrack_bridge: add support for IPv6")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Reported-by: Yuehaibing <yuehaibing@huawei.com>
Reported-by: kbuild test robot <lkp@intel.com>
Reported-by: wenxu <wenxu@ucloud.cn>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: wenxu <wenxu@ucloud.cn>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 7b3ed2a1

include/linux/netfilter_ipv6.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -96,6 +96,8 @@ static inline int nf_ip6_route(struct net net, struct dst_entry *dst,
		#endif
		}

		#include <net/netfilter/ipv6/nf_defrag_ipv6.h>

		static inline int nf_ipv6_br_defrag(struct net net, struct sk_buff skb,
		u32 user)
		{

net/ipv6/netfilter.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -238,7 +238,7 @@ static const struct nf_ipv6_ops ipv6ops = {
		.route_input = ip6_route_input,
		.fragment = ip6_fragment,
		.reroute = nf_ip6_reroute,
		#if IS_MODULE(CONFIG_NF_CONNTRACK_BRIDGE)
		#if IS_MODULE(CONFIG_IPV6)
		.br_defrag = nf_ct_frag6_gather,
		.br_fragment = br_ip6_fragment,
		#endif

Admin message