[PATCH net-next] netfilter: ipv6: fix compile err unknown field br_defrag and br_fragment

[PATCH net-next] netfilter: ipv6: fix compile err unknown field br_defrag and br_fragment

[wenxu]

From: wenxu <wenxu@ucloud.cn>

When CONFIG_IPV6 is not build with modules and CONIFG_NF_CONNTRACK_BRIDGE=m
There will compile err:
net/ipv6/netfilter.c:242:2: error: unknown field 'br_defrag' specified in initializer
  .br_defrag  = nf_ct_frag6_gather,
net/ipv6/netfilter.c:243:2: error: unknown field 'br_fragment' specified in initializer
  .br_fragment  = br_ip6_fragment,

Fixes: 764dd163ac92 ("netfilter: nf_conntrack_bridge: add support for IPv6")
Signed-off-by: wenxu <wenxu@ucloud.cn>
---
 net/ipv6/netfilter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ipv6/netfilter.c b/net/ipv6/netfilter.c
index c666538..9530cc2 100644
--- a/net/ipv6/netfilter.c
+++ b/net/ipv6/netfilter.c
@@ -238,7 +238,7 @@ int br_ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,
 	.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
-- 
1.8.3.1

Re: [PATCH net-next] netfilter: ipv6: fix compile err unknown field br_defrag and br_fragment

[Pablo Neira Ayuso]

Hi,

On Fri, May 31, 2019 at 05:02:55PM +0800, wenxu@ucloud.cn wrote:
> From: wenxu <wenxu@ucloud.cn>
> 
> When CONFIG_IPV6 is not build with modules and CONIFG_NF_CONNTRACK_BRIDGE=m
> There will compile err:
> net/ipv6/netfilter.c:242:2: error: unknown field 'br_defrag' specified in initializer
>   .br_defrag  = nf_ct_frag6_gather,
> net/ipv6/netfilter.c:243:2: error: unknown field 'br_fragment' specified in initializer
>   .br_fragment  = br_ip6_fragment,

Thanks for your patch, I have collapsed this chunk into:

http://patchwork.ozlabs.org/patch/1108255/