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

Commit c13ee2a4 authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

tcp: reindent two spots after prequeue removal 



These two branches are now always true, remove the conditional.
objdiff shows no changes.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e7942d06

net/ipv4/tcp_input.c

+23 −27
Original line number Diff line number Diff line
@@ -4611,7 +4611,6 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb) 
			goto out_of_window;



		/* Ok. In sequence. In window. */

		if (eaten <= 0) {

queue_and_out:

		if (eaten < 0) {

			if (skb_queue_len(&sk->sk_receive_queue) == 0)
@@ -4620,7 +4619,6 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb) 
				goto drop;

		}

		eaten = tcp_queue_rcv(sk, skb, 0, &fragstolen);

		}

		tcp_rcv_nxt_update(tp, TCP_SKB_CB(skb)->end_seq);

		if (skb->len)

			tcp_event_data_recv(sk, skb);
@@ -5410,7 +5408,6 @@ void tcp_rcv_established(struct sock *sk, struct sk_buff *skb, 
			int eaten = 0;

			bool fragstolen = false;



			if (!eaten) {

			if (tcp_checksum_complete(skb))

				goto csum_error;
@@ -5433,7 +5430,6 @@ void tcp_rcv_established(struct sock *sk, struct sk_buff *skb, 
			/* Bulk data transfer: receiver */

			eaten = tcp_queue_rcv(sk, skb, tcp_header_len,

					      &fragstolen);

			}



			tcp_event_data_recv(sk, skb);