niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

tcp: reindent two spots after prequeue removal

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

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Florian Westphal 2017-07-30 03:57:19 +02:00 • committed by David S. Miller
parent e7942d0633
commit c13ee2a4f0
1 changed files with 23 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/ipv4/tcp_input.c
View file

@ -4611,7 +4611,6 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb)
goto out_of_window; goto out_of_window;
/* Ok. In sequence. In window. */ /* Ok. In sequence. In window. */
if (eaten <= 0) {
queue_and_out: queue_and_out:
if (eaten < 0) { if (eaten < 0) {
if (skb_queue_len(&sk->sk_receive_queue) == 0) if (skb_queue_len(&sk->sk_receive_queue) == 0)
@ -4620,7 +4619,6 @@ queue_and_out:
goto drop; goto drop;
} }
eaten = tcp_queue_rcv(sk, skb, 0, &fragstolen); eaten = tcp_queue_rcv(sk, skb, 0, &fragstolen);
}
tcp_rcv_nxt_update(tp, TCP_SKB_CB(skb)->end_seq); tcp_rcv_nxt_update(tp, TCP_SKB_CB(skb)->end_seq);
if (skb->len) if (skb->len)
tcp_event_data_recv(sk, skb); tcp_event_data_recv(sk, skb);
@ -5410,7 +5408,6 @@ void tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
int eaten = 0; int eaten = 0;
bool fragstolen = false; bool fragstolen = false;
if (!eaten) {
if (tcp_checksum_complete(skb)) if (tcp_checksum_complete(skb))
goto csum_error; goto csum_error;
@ -5433,7 +5430,6 @@ void tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
/* Bulk data transfer: receiver */ /* Bulk data transfer: receiver */
eaten = tcp_queue_rcv(sk, skb, tcp_header_len, eaten = tcp_queue_rcv(sk, skb, tcp_header_len,
&fragstolen); &fragstolen);
}
tcp_event_data_recv(sk, skb); tcp_event_data_recv(sk, skb);