Commit 1aecbf18 authored by Miaohe Lin's avatar Miaohe Lin Committed by David S. Miller
Browse files

net: dccp: Convert to use the preferred fallthrough macro 



Convert the uses of fallthrough comments to fallthrough macro.

Signed-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3478f90c

net/dccp/ccids/ccid3.c

+1 −1
Original line number Diff line number Diff line
@@ -608,7 +608,7 @@ static void ccid3_hc_rx_send_feedback(struct sock *sk, 
		 */

		if (hc->rx_x_recv > 0)

			break;

		/* fall through */

		fallthrough;

	case CCID3_FBACK_PERIODIC:

		delta = ktime_us_delta(now, hc->rx_tstamp_last_feedback);

		if (delta <= 0)

net/dccp/feat.c

+2 −1
Original line number Diff line number Diff line
@@ -1407,7 +1407,8 @@ int dccp_feat_parse_options(struct sock *sk, struct dccp_request_sock *dreq, 
	 *	Negotiation during connection setup

	 */

	case DCCP_LISTEN:

		server = true;			/* fall through */

		server = true;

		fallthrough;

	case DCCP_REQUESTING:

		switch (opt) {

		case DCCPO_CHANGE_L:

net/dccp/input.c

+5 −5
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static int dccp_rcv_close(struct sock *sk, struct sk_buff *skb) 
		 */

		if (dccp_sk(sk)->dccps_role != DCCP_ROLE_CLIENT)

			break;

		/* fall through */

		fallthrough;

	case DCCP_REQUESTING:

	case DCCP_ACTIVE_CLOSEREQ:

		dccp_send_reset(sk, DCCP_RESET_CODE_CLOSED);
@@ -76,7 +76,7 @@ static int dccp_rcv_close(struct sock *sk, struct sk_buff *skb) 
		queued = 1;

		dccp_fin(sk, skb);

		dccp_set_state(sk, DCCP_PASSIVE_CLOSE);

		/* fall through */

		fallthrough;

	case DCCP_PASSIVE_CLOSE:

		/*

		 * Retransmitted Close: we have already enqueued the first one.
@@ -113,7 +113,7 @@ static int dccp_rcv_closereq(struct sock *sk, struct sk_buff *skb) 
		queued = 1;

		dccp_fin(sk, skb);

		dccp_set_state(sk, DCCP_PASSIVE_CLOSEREQ);

		/* fall through */

		fallthrough;

	case DCCP_PASSIVE_CLOSEREQ:

		sk_wake_async(sk, SOCK_WAKE_WAITD, POLL_HUP);

	}
@@ -530,7 +530,7 @@ static int dccp_rcv_respond_partopen_state_process(struct sock *sk, 
	case DCCP_PKT_DATA:

		if (sk->sk_state == DCCP_RESPOND)

			break;

		/* fall through */

		fallthrough;

	case DCCP_PKT_DATAACK:

	case DCCP_PKT_ACK:

		/*
@@ -684,7 +684,7 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb, 
		/* Step 8: if using Ack Vectors, mark packet acknowledgeable */

		dccp_handle_ackvec_processing(sk, skb);

		dccp_deliver_input_to_ccids(sk, skb);

		/* fall through */

		fallthrough;

	case DCCP_RESPOND:

		queued = dccp_rcv_respond_partopen_state_process(sk, skb,

								 dh, len);

net/dccp/options.c

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ int dccp_parse_options(struct sock *sk, struct dccp_request_sock *dreq, 
			 * interested. The RX CCID need not parse Ack Vectors,

			 * since it is only interested in clearing old state.

			 */

			/* fall through */

			fallthrough;

		case DCCPO_MIN_TX_CCID_SPECIFIC ... DCCPO_MAX_TX_CCID_SPECIFIC:

			if (ccid_hc_tx_parse_options(dp->dccps_hc_tx_ccid, sk,

						     pkt_type, opt, value, len))

net/dccp/output.c

+4 −4
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb) 
		switch (dcb->dccpd_type) {

		case DCCP_PKT_DATA:

			set_ack = 0;

			/* fall through */

			fallthrough;

		case DCCP_PKT_DATAACK:

		case DCCP_PKT_RESET:

			break;
@@ -72,12 +72,12 @@ static int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb) 
			/* Use ISS on the first (non-retransmitted) Request. */

			if (icsk->icsk_retransmits == 0)

				dcb->dccpd_seq = dp->dccps_iss;

			/* fall through */

			fallthrough;



		case DCCP_PKT_SYNC:

		case DCCP_PKT_SYNCACK:

			ackno = dcb->dccpd_ack_seq;

			/* fall through */

			fallthrough;

		default:

			/*

			 * Set owner/destructor: some skbs are allocated via
@@ -481,7 +481,7 @@ struct sk_buff *dccp_ctl_make_reset(struct sock *sk, struct sk_buff *rcv_skb) 
	case DCCP_RESET_CODE_PACKET_ERROR:

		dhr->dccph_reset_data[0] = rxdh->dccph_type;

		break;

	case DCCP_RESET_CODE_OPTION_ERROR:	/* fall through */

	case DCCP_RESET_CODE_OPTION_ERROR:

	case DCCP_RESET_CODE_MANDATORY_ERROR:

		memcpy(dhr->dccph_reset_data, dcb->dccpd_reset_data, 3);

		break;