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;
Subject: Re: [PATCH net-next] netfilter: nf_conntrack_bridge: Fix build error
 without IPV6
To:     Pablo Neira Ayuso <pablo@netfilter.org>
References: <20190531024643.3840-1-yuehaibing@huawei.com>
 <19095cab-fbc5-f200-a40c-cb4c1a12fbc6@huawei.com>
 <20190531080257.62mfimdlwuv42bk3@salvia>
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>
From:   Yuehaibing <yuehaibing@huawei.com>
Message-ID: <c65a989a-9b5d-b98e-1bdd-7820a34847c2@huawei.com>
Date:   Fri, 31 May 2019 17:05:51 +0800
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101
 Thunderbird/45.2.0
MIME-Version: 1.0
In-Reply-To: <20190531080257.62mfimdlwuv42bk3@salvia>
Content-Type: text/plain; charset="windows-1252"
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


On 2019/5/31 16:02, Pablo Neira Ayuso wrote:
> 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?

Yes, this works for me.

>