| Message ID | 20240322131746.904943-1-arnd@kernel.org (mailing list archive) |
|---|---|
| State | Deferred |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | ipv6: fib: hide unused 'pn' variable | expand |
On Fri, Mar 22, 2024 at 02:14:10PM +0100, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.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@arndb.de> ## Form letter - net-next-closed (text from Jakub) The merge window for v6.9 has begun and therefore net-next is closed for new drivers, features, code refactoring and optimizations. We are currently accepting bug fixes only. Please repost when net-next reopens after March 25th. RFC patches sent for review only are welcome at any time. See: https://www.kernel.org/doc/html/next/process/maintainer-netdev.html#development-cycle -- pw-bot: defer
On 3/22/24 7:14 AM, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.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@arndb.de> > --- > net/ipv6/ip6_fib.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) Reviewed-by: David Ahern <dsahern@kernel.org>
On Fri, 22 Mar 2024 13:25:49 +0000 Simon Horman wrote: > > Fixes: 66729e18df08 ("[IPV6] ROUTE: Make sure we have fn->leaf when adding a node on subtree.") > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > ## Form letter - net-next-closed I guess... If it's a W=1 warning there's no real urgency. We should probably also drop the Fixes tag, then.
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;