From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org, kuba@kernel.org
Subject: [PATCH net-next 6/7] netfilter: nft_socket: fix an unused variable warning
Date: Tue, 27 Apr 2021 22:43:44 +0200 [thread overview]
Message-ID: <20210427204345.22043-7-pablo@netfilter.org> (raw)
In-Reply-To: <20210427204345.22043-1-pablo@netfilter.org>
From: Arnd Bergmann <arnd@arndb.de>
The variable is only used in an #ifdef, causing a harmless warning:
net/netfilter/nft_socket.c: In function 'nft_socket_init':
net/netfilter/nft_socket.c:137:27: error: unused variable 'level' [-Werror=unused-variable]
137 | unsigned int len, level;
| ^~~~~
Move it into the same #ifdef block.
Fixes: e0bb96db96f8 ("netfilter: nft_socket: add support for cgroupsv2")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/nft_socket.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/net/netfilter/nft_socket.c b/net/netfilter/nft_socket.c
index 9c169d100651..f9c5ff6024e0 100644
--- a/net/netfilter/nft_socket.c
+++ b/net/netfilter/nft_socket.c
@@ -134,7 +134,7 @@ static int nft_socket_init(const struct nft_ctx *ctx,
const struct nlattr * const tb[])
{
struct nft_socket *priv = nft_expr_priv(expr);
- unsigned int len, level;
+ unsigned int len;
if (!tb[NFTA_SOCKET_DREG] || !tb[NFTA_SOCKET_KEY])
return -EINVAL;
@@ -160,7 +160,9 @@ static int nft_socket_init(const struct nft_ctx *ctx,
len = sizeof(u32);
break;
#ifdef CONFIG_CGROUPS
- case NFT_SOCKET_CGROUPV2:
+ case NFT_SOCKET_CGROUPV2: {
+ unsigned int level;
+
if (!tb[NFTA_SOCKET_LEVEL])
return -EINVAL;
@@ -171,6 +173,7 @@ static int nft_socket_init(const struct nft_ctx *ctx,
priv->level = level;
len = sizeof(u64);
break;
+ }
#endif
default:
return -EOPNOTSUPP;
--
2.30.2
next prev parent reply other threads:[~2021-04-27 20:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-27 20:43 [PATCH net-next 0/7] Netfilter updates for net-next Pablo Neira Ayuso
2021-04-27 20:43 ` [PATCH net-next 1/7] netfilter: nftables: rename set element data activation/deactivation functions Pablo Neira Ayuso
2021-04-27 22:40 ` patchwork-bot+netdevbpf
2021-04-27 20:43 ` [PATCH net-next 2/7] netfilter: nftables: add loop check helper function Pablo Neira Ayuso
2021-04-27 20:43 ` [PATCH net-next 3/7] netfilter: nftables: add helper function to flush set elements Pablo Neira Ayuso
2021-04-27 20:43 ` [PATCH net-next 4/7] netfilter: nftables: add helper function to validate set element data Pablo Neira Ayuso
2021-04-27 20:43 ` [PATCH net-next 5/7] netfilter: nftables: add catch-all set element support Pablo Neira Ayuso
2021-04-27 20:43 ` Pablo Neira Ayuso [this message]
2021-04-27 20:43 ` [PATCH net-next 7/7] netfilter: nft_socket: fix build with CONFIG_SOCK_CGROUP_DATA=n Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210427204345.22043-7-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).