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

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

tcp: Remove another indentation level in tcp_rcv_state_process 



case TCP_SYN_RECV: can have another indentation level removed
by converting

	if (acceptable) {
		...;
	} else {
		return 1;
	}

to
	if (!acceptable)
		return 1;
	...;

Reflow code and comments to fit 80 columns.

Another pure cleanup patch.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Improved-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1f6afc81

net/ipv4/tcp_input.c

+51 −59
Original line number Diff line number Diff line
@@ -5612,9 +5612,11 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb, 


	switch (sk->sk_state) {

	case TCP_SYN_RECV:

		if (acceptable) {

			/* Once we leave TCP_SYN_RECV, we no longer

			 * need req so release it.

		if (!acceptable)

			return 1;



		/* Once we leave TCP_SYN_RECV, we no longer need req

		 * so release it.

		 */

		if (req) {

			tcp_synack_rtt_meas(sk, req);
@@ -5622,9 +5624,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb, 


			reqsk_fastopen_remove(sk, req, false);

		} else {

				/* Make sure socket is routed, for

				 * correct metrics.

				 */

			/* Make sure socket is routed, for correct metrics. */

			icsk->icsk_af_ops->rebuild_header(sk);

			tcp_init_congestion_control(sk);
@@ -5636,46 +5636,38 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb, 
		tcp_set_state(sk, TCP_ESTABLISHED);

		sk->sk_state_change(sk);



			/* Note, that this wakeup is only for marginal

			 * crossed SYN case. Passively open sockets

			 * are not waked up, because sk->sk_sleep ==

			 * NULL and sk->sk_socket == NULL.

		/* Note, that this wakeup is only for marginal crossed SYN case.

		 * Passively open sockets are not waked up, because

		 * sk->sk_sleep == NULL and sk->sk_socket == NULL.

		 */

		if (sk->sk_socket)

			sk_wake_async(sk, SOCK_WAKE_IO, POLL_OUT);



		tp->snd_una = TCP_SKB_CB(skb)->ack_seq;

			tp->snd_wnd = ntohs(th->window) <<

					tp->rx_opt.snd_wscale;

		tp->snd_wnd = ntohs(th->window) << tp->rx_opt.snd_wscale;

		tcp_init_wl(tp, TCP_SKB_CB(skb)->seq);



		if (tp->rx_opt.tstamp_ok)

			tp->advmss -= TCPOLEN_TSTAMP_ALIGNED;



		if (req) {

				/* Re-arm the timer because data may

				 * have been sent out. This is similar

				 * to the regular data transmission case

			/* Re-arm the timer because data may have been sent out.

			 * This is similar to the regular data transmission case

			 * when new data has just been ack'ed.

			 *

				 * (TFO) - we could try to be more aggressive

				 * and retransmitting any data sooner based

				 * on when they are sent out.

			 * (TFO) - we could try to be more aggressive and

			 * retransmitting any data sooner based on when they

			 * are sent out.

			 */

			tcp_rearm_rto(sk);

		} else

			tcp_init_metrics(sk);



			/* Prevent spurious tcp_cwnd_restart() on

			 * first data packet.

			 */

		/* Prevent spurious tcp_cwnd_restart() on first data packet */

		tp->lsndtime = tcp_time_stamp;



		tcp_initialize_rcv_mss(sk);

		tcp_fast_path_on(tp);

		} else {

			return 1;

		}

		break;



	case TCP_FIN_WAIT1: