Skip to contentSkip to conversation

macvlan: Mark expected switch fall-through

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

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Gustavo A. R. Silva

author
#0 lore raw

PATCH 1/1 macvlan: 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:

drivers/net/macvlan.c: In function ‘macvlan_do_ioctl’:
drivers/net/macvlan.c:839:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
if (!net_eq(dev_net(dev), &init_net))

      ^

drivers/net/macvlan.c:841:2: note: here
case SIOCGHWTSTAMP:
^~~~

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

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

Signed-off-by Gustavo A. R. Silva <[email protected]>
---
 drivers/net/macvlan.c | 1 +
 1 file changed, 1 insertion(+)
drivers/net/macvlan.c +1 -0
index 92efa93649f0..61550122b563 100644
@@ -838,6 +838,7 @@ static int macvlan_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 	case SIOCSHWTSTAMP:
 		if (!net_eq(dev_net(dev), &init_net))
 			break;
+		/* fall through */
 	case SIOCGHWTSTAMP:
 		if (netif_device_present(real_dev) && ops->ndo_do_ioctl)
 			err = ops->ndo_do_ioctl(real_dev, &ifrr, cmd);
Signature · 1 line
2.21.0
maintainer
#1 lore raw

From: "Gustavo A. R. Silva" <[email protected]>
Date: Mon, 20 May 2019 09:44:49 -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:

drivers/net/macvlan.c: In function ‘macvlan_do_ioctl’:
drivers/net/macvlan.c:839:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
if (!net_eq(dev_net(dev), &init_net))

      ^

drivers/net/macvlan.c:841:2: note: here
case SIOCGHWTSTAMP:
^~~~

Quoted 6 lines

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

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

Signed-off-by Gustavo A. R. Silva <[email protected]>

I'll apply this to 'net' since it was introduced actually by arecent change.

author
#2 lore raw
Quoted 18 lines · David Miller

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

Quoted 15 lines

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

This patch fixes the following warning:

drivers/net/macvlan.c: In function ‘macvlan_do_ioctl’:
drivers/net/macvlan.c:839:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
if (!net_eq(dev_net(dev), &init_net))

      ^

drivers/net/macvlan.c:841:2: note: here
case SIOCGHWTSTAMP:
^~~~

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

Quoted 8 lines
Quoted 4 lines

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

Signed-off-by Gustavo A. R. Silva <[email protected]>

I'll apply this to 'net' since it was introduced actually by arecent change.

OK, great. :)

Thank you.
--
Gsutavo