Re: [PATCH net-next] tcp: tcp_data_queue() cleanup

[David Miller]

From: Eric Dumazet 
Date: Tue, 01 Aug 2017 07:02:44 -0700

> From: Eric Dumazet 
> 
> Commit c13ee2a4f03f ("tcp: reindent two spots after prequeue removal")
> removed code in tcp_data_queue().
> 
> We can go a little farther, removing an always true test,
> and removing initializers for fragstolen and eaten variables.
> 
> Signed-off-by: Eric Dumazet 

Series applied, thanks!

[PATCH net-next] tcp: tcp_data_queue() cleanup

[Eric Dumazet]

From: Eric Dumazet 

Commit c13ee2a4f03f ("tcp: reindent two spots after prequeue removal")
removed code in tcp_data_queue().

We can go a little farther, removing an always true test,
and removing initializers for fragstolen and eaten variables.

Signed-off-by: Eric Dumazet 
Cc: Florian Westphal 
---
 net/ipv4/tcp_input.c |   15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 
af0a98d54b627a90d90fb9f1f2a600277c620559..df670d7ed98df1c108dc654cf446344ff9fdd4be
 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -4564,8 +4564,8 @@ int tcp_send_rcvq(struct sock *sk, struct msghdr *msg, 
size_t size)
 static void tcp_data_queue(struct sock *sk, struct sk_buff *skb)
 {
struct tcp_sock *tp = tcp_sk(sk);
-   bool fragstolen = false;
-   int eaten = -1;
+   bool fragstolen;
+   int eaten;
 
if (TCP_SKB_CB(skb)->seq == TCP_SKB_CB(skb)->end_seq) {
__kfree_skb(skb);
@@ -4588,12 +4588,11 @@ static void tcp_data_queue(struct sock *sk, struct 
sk_buff *skb)
 
/* Ok. In sequence. In window. */
 queue_and_out:
-   if (eaten < 0) {
-   if (skb_queue_len(>sk_receive_queue) == 0)
-   sk_forced_mem_schedule(sk, skb->truesize);
-   else if (tcp_try_rmem_schedule(sk, skb, skb->truesize))
-   goto drop;
-   }
+   if (skb_queue_len(>sk_receive_queue) == 0)
+   sk_forced_mem_schedule(sk, skb->truesize);
+   else if (tcp_try_rmem_schedule(sk, skb, skb->truesize))
+   goto drop;
+
eaten = tcp_queue_rcv(sk, skb, 0, );
tcp_rcv_nxt_update(tp, TCP_SKB_CB(skb)->end_seq);
if (skb->len)