From: Breno Leitao Date: Fri, 21 Feb 2025 17:51:27 +0000 (-0800) Subject: net: Remove shadow variable in netdev_run_todo() X-Git-Tag: v6.15-rc1~160^2~237 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7183877d6853801258b7a8d3b51b415982e5097e;p=thirdparty%2Fkernel%2Flinux.git net: Remove shadow variable in netdev_run_todo() Fix a shadow variable warning in net/core/dev.c when compiled with CONFIG_LOCKDEP enabled. The warning occurs because 'dev' is redeclared inside the while loop, shadowing the outer scope declaration. net/core/dev.c:11211:22: warning: declaration shadows a local variable [-Wshadow] struct net_device *dev = list_first_entry(&unlink_list, net/core/dev.c:11202:21: note: previous declaration is here struct net_device *dev, *tmp; Remove the redundant declaration since the variable is already defined in the outer scope and will be overwritten in the subsequent list_for_each_entry_safe() loop anyway. Signed-off-by: Breno Leitao Reviewed-by: Eric Dumazet Link: https://patch.msgid.link/20250221-netcons_fix_shadow-v1-1-dee20c8658dd@debian.org Signed-off-by: Jakub Kicinski --- diff --git a/net/core/dev.c b/net/core/dev.c index 8c7ee7ada6a3e..3f525278a8718 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -11209,9 +11209,8 @@ void netdev_run_todo(void) list_replace_init(&net_unlink_list, &unlink_list); while (!list_empty(&unlink_list)) { - struct net_device *dev = list_first_entry(&unlink_list, - struct net_device, - unlink_list); + dev = list_first_entry(&unlink_list, struct net_device, + unlink_list); list_del_init(&dev->unlink_list); dev->nested_level = dev->lower_level - 1; }