Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Fri, 31 May 2019 10:02:57 +0200
From:   Pablo Neira Ayuso <pablo@netfilter.org>
To:     Yuehaibing <yuehaibing@huawei.com>
Cc:     kadlec@blackhole.kfki.hu, fw@strlen.de,
        linux-kernel@vger.kernel.org, coreteam@netfilter.org,
        netfilter-devel@vger.kernel.org, netdev@vger.kernel.org
Subject: Re: [PATCH net-next] netfilter: nf_conntrack_bridge: Fix build error
 without IPV6
Message-ID: <20190531080257.62mfimdlwuv42bk3@salvia>
References: <20190531024643.3840-1-yuehaibing@huawei.com>
 <19095cab-fbc5-f200-a40c-cb4c1a12fbc6@huawei.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="mledociainyopav3"
Content-Disposition: inline
In-Reply-To: <19095cab-fbc5-f200-a40c-cb4c1a12fbc6@huawei.com>
User-Agent: NeoMutt/20170113 (1.7.2)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


--mledociainyopav3
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Fri, May 31, 2019 at 11:06:49AM +0800, Yuehaibing wrote:
> +cc netdev
> 
> On 2019/5/31 10:46, YueHaibing wrote:
> > Fix gcc build error while CONFIG_IPV6 is not set
> > 
> > In file included from net/netfilter/core.c:19:0:
> > ./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' [-Werror=implicit-function-declaration]
> > 
> > Reported-by: Hulk Robot <hulkci@huawei.com>
> > Fixes: 764dd163ac92 ("netfilter: nf_conntrack_bridge: add support for IPv6")
> > Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> > ---
> >  include/linux/netfilter_ipv6.h | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/include/linux/netfilter_ipv6.h b/include/linux/netfilter_ipv6.h
> > index a21b8c9..4ea97fd 100644
> > --- a/include/linux/netfilter_ipv6.h
> > +++ b/include/linux/netfilter_ipv6.h
> > @@ -96,6 +96,8 @@ static inline int nf_ip6_route(struct net *net, struct dst_entry **dst,
> >  #endif
> >  }
> >  
> > +int nf_ct_frag6_gather(struct net *net, struct sk_buff *skb, u32 user);
> > +

This is already defined in:

include/net/netfilter/ipv6/nf_defrag_ipv6.h

Probably this?

--mledociainyopav3
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="x.patch"

diff --git a/include/linux/netfilter_ipv6.h b/include/linux/netfilter_ipv6.h
index a21b8c9623ee..3a3dc4b1f0e7 100644
--- a/include/linux/netfilter_ipv6.h
+++ b/include/linux/netfilter_ipv6.h
@@ -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)
 {

--mledociainyopav3--