Skip to contentSkip to conversation

vlan: Mark expected switch fall-through

PATCH In review Gustavo A. R. Silva 2 participants 2 messages May 20, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 vlan: Mark expected switch fall-through

In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.

This patch fixes the following warning:

net/8021q/vlan_dev.c: In function ‘vlan_dev_ioctl’:
net/8021q/vlan_dev.c:374:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
if (!net_eq(dev_net(dev), &init_net))

      ^

net/8021q/vlan_dev.c:376:2: note: here
case SIOCGMIIPHY:
^~~~

Warning level 3 was used: -Wimplicit-fallthrough=3

This patch is part of the ongoing efforts to enable -Wimplicit-fallthrough.

---
 net/8021q/vlan_dev.c | 1 +
 1 file changed, 1 insertion(+)
net/8021q/vlan_dev.c +1 -0
index 2a9a60733594..c546c4228075 100644
@@ -373,6 +373,7 @@ static int vlan_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 	case SIOCSHWTSTAMP:
 		if (!net_eq(dev_net(dev), &init_net))
 			break;
+		/* fall through */
 	case SIOCGMIIPHY:
 	case SIOCGMIIREG:
 	case SIOCSMIIREG:
Signature · 1 line
2.21.0
maintainer
#1 lore raw

From: "Gustavo A. R. Silva" <[email protected]>
Date: Mon, 20 May 2019 09:51:05 -0500

Quoted 13 lines

In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.

This patch fixes the following warning:

net/8021q/vlan_dev.c: In function ‘vlan_dev_ioctl’:
net/8021q/vlan_dev.c:374:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
if (!net_eq(dev_net(dev), &init_net))

      ^

net/8021q/vlan_dev.c:376:2: note: here
case SIOCGMIIPHY:
^~~~

Quoted 6 lines

Warning level 3 was used: -Wimplicit-fallthrough=3

This patch is part of the ongoing efforts to enable -Wimplicit-fallthrough.

Also applied to 'net', thanks.