tcp: tcp_data_queue() cleanup

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 <edumazet@google.com>
Cc: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index af0a98d..df670d7 100644 (file)
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -4564,8 +4564,8 @@ err:
 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->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->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, &fragstolen);
                tcp_rcv_nxt_update(tp, TCP_SKB_CB(skb)->end_seq);
                if (skb->len)