Commit a8eceea8 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

inet: Use fallthrough; 

Convert the various uses of fallthrough comments to fallthrough;

Done via script
Link: https://lore.kernel.org/lkml/b56602fcf79f849e733e7b521bb0e17895d390fa.1582230379.git.joe@perches.com/



And by hand:

net/ipv6/ip6_fib.c has a fallthrough comment outside of an #ifdef block
that causes gcc to emit a warning if converted in-place.

So move the new fallthrough; inside the containing #ifdef/#endif too.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8a765471

net/ipv4/af_inet.c

+2 −2
Original line number Diff line number Diff line
@@ -872,7 +872,7 @@ int inet_shutdown(struct socket *sock, int how) 
		err = -ENOTCONN;

		/* Hack to wake up other listeners, who can poll for

		   EPOLLHUP, even on eg. unconnected UDP sockets -- RR */

		/* fall through */

		fallthrough;

	default:

		sk->sk_shutdown |= how;

		if (sk->sk_prot->shutdown)
@@ -886,7 +886,7 @@ int inet_shutdown(struct socket *sock, int how) 
	case TCP_LISTEN:

		if (!(how & RCV_SHUTDOWN))

			break;

		/* fall through */

		fallthrough;

	case TCP_SYN_SENT:

		err = sk->sk_prot->disconnect(sk, O_NONBLOCK);

		sock->state = err ? SS_DISCONNECTING : SS_UNCONNECTED;

net/ipv4/ah4.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static int ip_clear_mutable_options(const struct iphdr *iph, __be32 *daddr) 
			if (optlen < 6)

				return -EINVAL;

			memcpy(daddr, optptr+optlen-4, 4);

			/* Fall through */

			fallthrough;

		default:

			memset(optptr, 0, optlen);

		}

net/ipv4/arp.c

+1 −1
Original line number Diff line number Diff line
@@ -1181,7 +1181,7 @@ int arp_ioctl(struct net *net, unsigned int cmd, void __user *arg) 
	case SIOCSARP:

		if (!ns_capable(net->user_ns, CAP_NET_ADMIN))

			return -EPERM;

		/* fall through */

		fallthrough;

	case SIOCGARP:

		err = copy_from_user(&r, arg, sizeof(struct arpreq));

		if (err)

net/ipv4/devinet.c

+3 −3
Original line number Diff line number Diff line
@@ -1566,11 +1566,11 @@ static int inetdev_event(struct notifier_block *this, unsigned long event, 
			}

		}

		ip_mc_up(in_dev);

		/* fall through */

		fallthrough;

	case NETDEV_CHANGEADDR:

		if (!IN_DEV_ARP_NOTIFY(in_dev))

			break;

		/* fall through */

		fallthrough;

	case NETDEV_NOTIFY_PEERS:

		/* Send gratuitous ARP to notify of link change */

		inetdev_send_gratuitous_arp(dev, in_dev);
@@ -1588,7 +1588,7 @@ static int inetdev_event(struct notifier_block *this, unsigned long event, 
		if (inetdev_valid_mtu(dev->mtu))

			break;

		/* disable IP when MTU is not enough */

		/* fall through */

		fallthrough;

	case NETDEV_UNREGISTER:

		inetdev_destroy(in_dev);

		break;

net/ipv4/fib_semantics.c

+2 −2
Original line number Diff line number Diff line
@@ -1962,7 +1962,7 @@ int fib_sync_down_dev(struct net_device *dev, unsigned long event, bool force) 
				case NETDEV_DOWN:

				case NETDEV_UNREGISTER:

					nexthop_nh->fib_nh_flags |= RTNH_F_DEAD;

					/* fall through */

					fallthrough;

				case NETDEV_CHANGE:

					nexthop_nh->fib_nh_flags |= RTNH_F_LINKDOWN;

					break;
@@ -1984,7 +1984,7 @@ int fib_sync_down_dev(struct net_device *dev, unsigned long event, bool force) 
			case NETDEV_DOWN:

			case NETDEV_UNREGISTER:

				fi->fib_flags |= RTNH_F_DEAD;

				/* fall through */

				fallthrough;

			case NETDEV_CHANGE:

				fi->fib_flags |= RTNH_F_LINKDOWN;

				break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE