2021-07-21 21:02:42

by Arnd Bergmann

Subject: [PATCH] netfilter: nfnl_hook: fix unused variable warning

From: Arnd Bergmann <[email protected]>

The only user of this variable is in an #ifdef:

net/netfilter/nfnetlink_hook.c: In function 'nfnl_hook_entries_head':
net/netfilter/nfnetlink_hook.c:177:28: error: unused variable 'netdev' [-Werror=unused-variable]

Fixes: e2cf17d3774c ("netfilter: add new hook nfnl subsystem")
Signed-off-by: Arnd Bergmann <[email protected]>
---
net/netfilter/nfnetlink_hook.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/net/netfilter/nfnetlink_hook.c b/net/netfilter/nfnetlink_hook.c
index 50b4e3c9347a..202f57d17bab 100644
--- a/net/netfilter/nfnetlink_hook.c
+++ b/net/netfilter/nfnetlink_hook.c
@@ -174,7 +174,9 @@ static const struct nf_hook_entries *
nfnl_hook_entries_head(u8 pf, unsigned int hook, struct net *net, const char *dev)
{
const struct nf_hook_entries *hook_head = NULL;
+#ifdef CONFIG_NETFILTER_INGRESS
struct net_device *netdev;
+#endif

switch (pf) {
case NFPROTO_IPV4:
--
2.29.2

2021-07-23 12:34:46

by Pablo Neira Ayuso

Subject: Re: [PATCH] netfilter: nfnl_hook: fix unused variable warning

On Wed, Jul 21, 2021 at 05:22:32PM +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> The only user of this variable is in an #ifdef:
>
> net/netfilter/nfnetlink_hook.c: In function 'nfnl_hook_entries_head':
> net/netfilter/nfnetlink_hook.c:177:28: error: unused variable 'netdev' [-Werror=unused-variable]

Applied, thanks.