Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ad5122f authored by Tom Rix's avatar Tom Rix Committed by Greg Kroah-Hartman
Browse files

netfilter: conntrack: define variables exp_nat_nla_policy and any_addr with CONFIG_NF_NAT 



[ 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: default avatarTom Rix <trix@redhat.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d7ade4af

net/netfilter/nf_conntrack_netlink.c

+4 −0
Original line number Diff line number Diff line
@@ -2681,7 +2681,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)

{
@@ -3181,10 +3183,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,