[PATCH net-next v2] netfilter: ipv6: Fix undefined symbol nf_ct_frag6_gather

[PATCH net-next v2] netfilter: ipv6: Fix undefined symbol nf_ct_frag6_gather

[wenxu]

From: wenxu <wenxu@ucloud.cn>

CONFIG_NETFILTER=m and CONFIG_NF_DEFRAG_IPV6 is not set

ERROR: "nf_ct_frag6_gather" [net/ipv6/ipv6.ko] undefined!

Fixes: c9bb6165a16e ("netfilter: nf_conntrack_bridge: fix CONFIG_IPV6=y")
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: wenxu <wenxu@ucloud.cn>
---
v2: Forgot to include "net-next"

 net/ipv6/netfilter.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net/ipv6/netfilter.c b/net/ipv6/netfilter.c
index 9530cc2..96d7abf 100644
--- a/net/ipv6/netfilter.c
+++ b/net/ipv6/netfilter.c
@@ -238,8 +238,10 @@ 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_IPV6)
+#if IS_MODULE(CONFIG_IPV6) && IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
 	.br_defrag		= nf_ct_frag6_gather,
+#endif
+#if IS_MODULE(CONFIG_IPV6)
 	.br_fragment		= br_ip6_fragment,
 #endif
 };
-- 
1.8.3.1

Re: [PATCH net-next v2] netfilter: ipv6: Fix undefined symbol nf_ct_frag6_gather

[Pablo Neira Ayuso]

On Sun, Jun 02, 2019 at 09:49:26PM +0800, wenxu@ucloud.cn wrote:
> From: wenxu <wenxu@ucloud.cn>
> 
> CONFIG_NETFILTER=m and CONFIG_NF_DEFRAG_IPV6 is not set
> 
> ERROR: "nf_ct_frag6_gather" [net/ipv6/ipv6.ko] undefined!
> 
> Fixes: c9bb6165a16e ("netfilter: nf_conntrack_bridge: fix CONFIG_IPV6=y")
> Reported-by: kbuild test robot <lkp@intel.com>
> Signed-off-by: wenxu <wenxu@ucloud.cn>

Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>

Thanks!

Re: [PATCH net-next v2] netfilter: ipv6: Fix undefined symbol nf_ct_frag6_gather

[Pablo Neira Ayuso]

On Mon, Jun 03, 2019 at 11:21:28AM +0200, Pablo Neira Ayuso wrote:
> On Sun, Jun 02, 2019 at 09:49:26PM +0800, wenxu@ucloud.cn wrote:
> > From: wenxu <wenxu@ucloud.cn>
> > 
> > CONFIG_NETFILTER=m and CONFIG_NF_DEFRAG_IPV6 is not set

Just noted that this should be:

CONFIG_IPV6=m

> > ERROR: "nf_ct_frag6_gather" [net/ipv6/ipv6.ko] undefined!
> > 
> > Fixes: c9bb6165a16e ("netfilter: nf_conntrack_bridge: fix CONFIG_IPV6=y")
> > Reported-by: kbuild test robot <lkp@intel.com>
> > Signed-off-by: wenxu <wenxu@ucloud.cn>
> 
> Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>

nf-next is already in sync with net-next, so I can apply this patch
here, as an alternative path.

Re: [PATCH net-next v2] netfilter: ipv6: Fix undefined symbol nf_ct_frag6_gather

[Pablo Neira Ayuso]

On Sun, Jun 02, 2019 at 09:49:26PM +0800, wenxu@ucloud.cn wrote:
> From: wenxu <wenxu@ucloud.cn>
> 
> CONFIG_NETFILTER=m and CONFIG_NF_DEFRAG_IPV6 is not set
> 
> ERROR: "nf_ct_frag6_gather" [net/ipv6/ipv6.ko] undefined!

Applied to nf-next, thanks.