From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3F13523C9A for ; Thu, 25 May 2023 18:43:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7D042C433A0; Thu, 25 May 2023 18:43:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1685040224; bh=36/+3Yj2TL9UeAYZLorBKr5qKy2LKKXj2pT6PUq4c2Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ui1jMJ8/Z4IJjBcVzrwaCvj0j0Vf5o++L6nRvD8llLInW5cERCQIizc5IPeGeBZ+h mWY1Qej45j45+V2g8MUh/GKcqfNNooPFCNvWWYlHFm0cLdax5yzitMF4FLZMUsDag2 iKyI2O5UnGn2ySPij0vN+ykXmny51BeHNPiEXsPtepJ11E/WMA1rfIm2dmHUL8KMTa AJdQfMVIgUVlUBYsLkaVOH9vgoaotpqy1SEoKLmBj6KHVEZ0za8dcaVRzUhFGtbgLL 1E6fvlCry9hNkgubK4pdBjdDO391QBacqErnGDNuCXnAQip4JLr/jn7oPItWEBv29j qJthjRUV7/cRA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tom Rix , Simon Horman , Florian Westphal , Sasha Levin , pablo@netfilter.org, kadlec@netfilter.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 24/27] netfilter: conntrack: define variables exp_nat_nla_policy and any_addr with CONFIG_NF_NAT Date: Thu, 25 May 2023 14:42:33 -0400 Message-Id: <20230525184238.1943072-24-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230525184238.1943072-1-sashal@kernel.org> References: <20230525184238.1943072-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Tom Rix [ Upstream commit 224a876e37543eee111bf9b6aa4935080e619335 ] gcc with W=1 and ! CONFIG_NF_NAT net/netfilter/nf_conntrack_netlink.c:3463:32: error: ‘exp_nat_nla_policy’ defined but not used [-Werror=unused-const-variable=] 3463 | static const struct nla_policy exp_nat_nla_policy[CTA_EXPECT_NAT_MAX+1] = { | ^~~~~~~~~~~~~~~~~~ net/netfilter/nf_conntrack_netlink.c:2979:33: error: ‘any_addr’ defined but not used [-Werror=unused-const-variable=] 2979 | static const union nf_inet_addr any_addr; | ^~~~~~~~ These variables use is controlled by CONFIG_NF_NAT, so should their definitions. Signed-off-by: Tom Rix Reviewed-by: Simon Horman Signed-off-by: Florian Westphal Signed-off-by: Sasha Levin --- net/netfilter/nf_conntrack_netlink.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index 4747daf901e71..c1c24b5a43bc4 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c @@ -2712,7 +2712,9 @@ static int ctnetlink_exp_dump_mask(struct sk_buff *skb, return -1; } +#if IS_ENABLED(CONFIG_NF_NAT) static const union nf_inet_addr any_addr; +#endif static __be32 nf_expect_get_id(const struct nf_conntrack_expect *exp) { @@ -3212,10 +3214,12 @@ ctnetlink_change_expect(struct nf_conntrack_expect *x, return 0; } +#if IS_ENABLED(CONFIG_NF_NAT) static const struct nla_policy exp_nat_nla_policy[CTA_EXPECT_NAT_MAX+1] = { [CTA_EXPECT_NAT_DIR] = { .type = NLA_U32 }, [CTA_EXPECT_NAT_TUPLE] = { .type = NLA_NESTED }, }; +#endif static int ctnetlink_parse_expect_nat(const struct nlattr *attr, -- 2.39.2