[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20240322131746.904943-1-arnd@kernel.org>
Date: Fri, 22 Mar 2024 14:14:10 +0100
From: Arnd Bergmann <arnd@...nel.org>
To: "David S. Miller" <davem@...emloft.net>,
David Ahern <dsahern@...nel.org>,
Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>,
YOSHIFUJI Hideaki <yoshfuji@...ux-ipv6.org>,
Ville Nuorvala <vnuorval@....hut.fi>
Cc: Arnd Bergmann <arnd@...db.de>,
Kui-Feng Lee <thinker.li@...il.com>,
Breno Leitao <leitao@...ian.org>,
Kunwu Chan <chentao@...inos.cn>,
netdev@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: [PATCH] ipv6: fib: hide unused 'pn' variable
From: Arnd Bergmann <arnd@...db.de>
When CONFIG_IPV6_SUBTREES is disabled, the only user is hidden, causing
a 'make W=1' warning:
net/ipv6/ip6_fib.c: In function 'fib6_add':
net/ipv6/ip6_fib.c:1388:32: error: variable 'pn' set but not used [-Werror=unused-but-set-variable]
Add another #ifdef around the variable declaration, matching the other
uses in this file.
Fixes: 66729e18df08 ("[IPV6] ROUTE: Make sure we have fn->leaf when adding a node on subtree.")
Signed-off-by: Arnd Bergmann <arnd@...db.de>
---
net/ipv6/ip6_fib.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index 5c558dc1c683..a2888bda3a87 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -1385,7 +1385,10 @@ int fib6_add(struct fib6_node *root, struct fib6_info *rt,
struct nl_info *info, struct netlink_ext_ack *extack)
{
struct fib6_table *table = rt->fib6_table;
- struct fib6_node *fn, *pn = NULL;
+ struct fib6_node *fn;
+#ifdef CONFIG_IPV6_SUBTREES
+ struct fib6_node *pn = NULL;
+#endif
int err = -ENOMEM;
int allow_create = 1;
int replace_required = 0;
@@ -1409,9 +1412,9 @@ int fib6_add(struct fib6_node *root, struct fib6_info *rt,
goto out;
}
+#ifdef CONFIG_IPV6_SUBTREES
pn = fn;
-#ifdef CONFIG_IPV6_SUBTREES
if (rt->fib6_src.plen) {
struct fib6_node *sn;
--
2.39.2
Powered by blists - more mailing lists