net: Remove redundant variable declaration in __dev_change_flags()
authorBreno Leitao <leitao@debian.org>
Mon, 17 Feb 2025 15:48:13 +0000 (07:48 -0800)
committerJakub Kicinski <kuba@kernel.org>
Wed, 19 Feb 2025 02:10:56 +0000 (18:10 -0800)
The old_flags variable is declared twice in __dev_change_flags(),
causing a shadow variable warning. This patch fixes the issue by
removing the redundant declaration, reusing the existing old_flags
variable instead.

net/core/dev.c:9225:16: warning: declaration shadows a local variable [-Wshadow]
9225 |                 unsigned int old_flags = dev->flags;
|                              ^
net/core/dev.c:9185:15: note: previous declaration is here
9185 |         unsigned int old_flags = dev->flags;
|                      ^
1 warning generated.

Remove the redundant inner declaration and reuse the existing old_flags
variable since its value is not needed outside the if block, and it is
safe to reuse the variable. This eliminates the warning while
maintaining the same functionality.

Signed-off-by: Breno Leitao <leitao@debian.org>
Reviewed-by: Mateusz Polchlopek <mateusz.polchlopek@intel.com>
Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Reviewed-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/20250217-old_flags-v2-1-4cda3b43a35f@debian.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/core/dev.c

index bcb266ab29126c590ac8b10054ddd8360dd2b34a..ebc000b568283183382128e5e42b7e499ae50c1d 100644 (file)
@@ -9182,7 +9182,7 @@ int __dev_change_flags(struct net_device *dev, unsigned int flags,
 
        if ((flags ^ dev->gflags) & IFF_PROMISC) {
                int inc = (flags & IFF_PROMISC) ? 1 : -1;
-               unsigned int old_flags = dev->flags;
+               old_flags = dev->flags;
 
                dev->gflags ^= IFF_PROMISC;