lkml.org 
[lkml]   [2023]   [May]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 6.3 56/67] netfilter: conntrack: define variables exp_nat_nla_policy and any_addr with CONFIG_NF_NAT
    Date
    From: Tom Rix <trix@redhat.com>

    [ 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 <trix@redhat.com>
    Reviewed-by: Simon Horman <simon.horman@corigine.com>
    Signed-off-by: Florian Westphal <fw@strlen.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 6f3b23a6653cc..7217a89f067cb 100644
    --- a/net/netfilter/nf_conntrack_netlink.c
    +++ b/net/netfilter/nf_conntrack_netlink.c
    @@ -2984,7 +2984,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)
    {
    @@ -3468,10 +3470,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
    \
     
     \ /
      Last update: 2023-05-25 22:39    [W:4.244 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site