Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp2058435ybi; Thu, 20 Jun 2019 08:26:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqxoVuE59oTL9AJPSEPXQGF0uo+lCBt6/PgEmCOEQI/JKYEEqy9miOCnl6Onxe/3eTi/13gW X-Received: by 2002:a17:902:8543:: with SMTP id d3mr2810712plo.78.1561044390689; Thu, 20 Jun 2019 08:26:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561044390; cv=none; d=google.com; s=arc-20160816; b=EgGAn0jy8dZkD1qbJpO3m7UHYYxbrH9c7ZtNDBX+jc3Dqk8SFSyDg0maFoJxFkzxf+ +vfTO1ORdKmWZAfJeO1b2NLNszhVtEXVpsIXe1ILZX3gVZ8uoSNolLPvk9M2nTlfZk2l 6sypy74Nx0Opmh2R7AHhQaMc529aWHOxB5mZqXY8FPQxYQZ2hPt+SkCK6yvjXDhzp1Qs 5a/lT0aImD1caldABLE570JS0CWo9Y6n0szAabVdVdsr7XcH1foUpYKz7QmwNIJDuIPn HIMYS1KxZ5a/AuWNJHAGLSOcS/5Yv80GR44dQ4nkxiIFxGhIpI8aNi4gBufMjj78WWQm C/HQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:in-reply-to :mime-version:user-agent:date:message-id:from:cc:references:to :subject; bh=q6HHxU0NR6fgZPBOpb/LhV6pDD7VRHcvuNmkcohOBI4=; b=bo0hYoPvGyDCeRQOLVE1hNCR6lAXrDlu+0NvM9npDbqawVsRwmmqV52AcqRinorLc8 NsREMHOEH9NA8hWTJhLU2/SdYyELzNaytp58EtAuVz6zpNahSEEfZu1O8BF0Q/qKzeW9 Ka9uEZYFg/2kjsfIAGECjiOgXxgGaT85D6+UXpl0w6N0pPJpvSqKagx6GEZZ42bMynpG p86Sgf0yxBsRDsrYUOgzQUtrsugsccO7U1ZSPlMAYsuyf6VY66XkRgyHS+/T9Xvy++Dc GctUnFqm3Rmr7pwTe16KjNQKTuCuBt1+VQaQXqGhANdTl0/P/AGTZyrrVWgClj5tdQ3M qPig== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d13si4386823pgl.545.2019.06.20.08.26.15; Thu, 20 Jun 2019 08:26:30 -0700 (PDT) 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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726874AbfFTP0J (ORCPT + 99 others); Thu, 20 Jun 2019 11:26:09 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:19049 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726428AbfFTP0J (ORCPT ); Thu, 20 Jun 2019 11:26:09 -0400 Received: from DGGEMS404-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 00609F52E4A9FE473DD7; Thu, 20 Jun 2019 23:26:05 +0800 (CST) Received: from [127.0.0.1] (10.133.213.239) by DGGEMS404-HUB.china.huawei.com (10.3.19.204) with Microsoft SMTP Server id 14.3.439.0; Thu, 20 Jun 2019 23:26:02 +0800 Subject: Re: [PATCH net-next] netfilter: ipv6: Fix build error without CONFIG_IPV6 To: , , , , References: <20190612084715.21656-1-yuehaibing@huawei.com> CC: , , , From: Yuehaibing Message-ID: Date: Thu, 20 Jun 2019 23:26:01 +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: <20190612084715.21656-1-yuehaibing@huawei.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.133.213.239] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Friendly ping... On 2019/6/12 16:47, YueHaibing wrote: > If CONFIG_IPV6 is not set, building fails: > > net/bridge/netfilter/nf_conntrack_bridge.o: In function `nf_ct_bridge_pre': > nf_conntrack_bridge.c:(.text+0x41c): undefined symbol `nf_ct_frag6_gather' > net/bridge/netfilter/nf_conntrack_bridge.o: In function `nf_ct_bridge_post': > nf_conntrack_bridge.c:(.text+0x820): undefined symbol `br_ip6_fragment' > > Reported-by: Hulk Robot > Reported-by: Randy Dunlap > Fixes: c9bb6165a16e ("netfilter: nf_conntrack_bridge: fix CONFIG_IPV6=y") > Signed-off-by: YueHaibing > --- > include/linux/netfilter_ipv6.h | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/include/linux/netfilter_ipv6.h b/include/linux/netfilter_ipv6.h > index 3a3dc4b..0e1febc 100644 > --- a/include/linux/netfilter_ipv6.h > +++ b/include/linux/netfilter_ipv6.h > @@ -108,8 +108,11 @@ static inline int nf_ipv6_br_defrag(struct net *net, struct sk_buff *skb, > return 1; > > return v6_ops->br_defrag(net, skb, user); > -#else > +#endif > +#if IS_BUILTIN(CONFIG_IPV6) > return nf_ct_frag6_gather(net, skb, user); > +#else > + return 1; > #endif > } > > @@ -133,8 +136,11 @@ static inline int nf_br_ip6_fragment(struct net *net, struct sock *sk, > return 1; > > return v6_ops->br_fragment(net, sk, skb, data, output); > -#else > +#endif > +#if IS_BUILTIN(CONFIG_IPV6) > return br_ip6_fragment(net, sk, skb, data, output); > +#else > + return 1; > #endif > } > >