Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 275757e6 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by David S. Miller
Browse files

ipv6: mark expected switch fall-throughs 



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

Notice that in some cases I placed the "fall through" comment
on its own line, which is what GCC is expecting to find.

Signed-off-by: default avatarGustavo A. R. Silva <garsilva@embeddedor.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fb6ff75e

net/ipv6/ah6.c

+1 −0
Original line number Diff line number Diff line
@@ -271,6 +271,7 @@ static int ipv6_clear_mutable_options(struct ipv6hdr *iph, int len, int dir) 
		case NEXTHDR_DEST:

			if (dir == XFRM_POLICY_OUT)

				ipv6_rearrange_destopt(iph, exthdr.opth);

			/* fall through */

		case NEXTHDR_HOP:

			if (!zero_out_mutable_opts(exthdr.opth)) {

				net_dbg_ratelimited("overrun %sopts\n",

net/ipv6/exthdrs.c

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ static bool ip6_tlvopt_unknown(struct sk_buff *skb, int optoff) 
		 */

		if (ipv6_addr_is_multicast(&ipv6_hdr(skb)->daddr))

			break;

		/* fall through */

	case 2: /* send ICMP PARM PROB regardless and drop packet */

		icmpv6_param_prob(skb, ICMPV6_UNK_OPTION, optoff);

		return false;

net/ipv6/icmp.c

+2 −4
Original line number Diff line number Diff line
@@ -864,10 +864,8 @@ static int icmpv6_rcv(struct sk_buff *skb) 
			goto discard_it;

		hdr = icmp6_hdr(skb);



		/*

		 *	Drop through to notify

		 */



		/* to notify */

		/* fall through */

	case ICMPV6_DEST_UNREACH:

	case ICMPV6_TIME_EXCEED:

	case ICMPV6_PARAMPROB:

net/ipv6/ip6_fib.c

+4 −0
Original line number Diff line number Diff line
@@ -1780,6 +1780,7 @@ static int fib6_walk_continue(struct fib6_walker *w) 
			}

			w->state = FWS_L;

#endif

			/* fall through */

		case FWS_L:

			left = rcu_dereference_protected(fn->left, 1);

			if (left) {
@@ -1788,6 +1789,7 @@ static int fib6_walk_continue(struct fib6_walker *w) 
				continue;

			}

			w->state = FWS_R;

			/* fall through */

		case FWS_R:

			right = rcu_dereference_protected(fn->right, 1);

			if (right) {
@@ -1797,6 +1799,7 @@ static int fib6_walk_continue(struct fib6_walker *w) 
			}

			w->state = FWS_C;

			w->leaf = rcu_dereference_protected(fn->leaf, 1);

			/* fall through */

		case FWS_C:

			if (w->leaf && fn->fn_flags & RTN_RTINFO) {

				int err;
@@ -1815,6 +1818,7 @@ static int fib6_walk_continue(struct fib6_walker *w) 
			}

skip:

			w->state = FWS_U;

			/* fall through */

		case FWS_U:

			if (fn == w->root)

				return 0;

net/ipv6/ip6_tunnel.c

+1 −0
Original line number Diff line number Diff line
@@ -593,6 +593,7 @@ ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, 
	case NDISC_REDIRECT:

		rel_type = ICMP_REDIRECT;

		rel_code = ICMP_REDIR_HOST;

		/* fall through */

	default:

		return 0;

	}