[PATCH v2 net-next] tcp: remove hdrlen argument from tcp_queue_rcv()

[Eric Dumazet]

Only one caller needs to pull TCP headers, so lets
move __skb_pull() to the caller side.

Signed-off-by: Eric Dumazet <eduma...@google.com>
Acked-by: Yuchung Cheng <ych...@google.com>
---
v2: sent as a standalone patch.

 net/ipv4/tcp_input.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 
568dbf3b711af75e5f4f0a309f8943579e913494..f32397890b6dcbc34976954c4be142108efa04d8
 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -4603,13 +4603,12 @@ static void tcp_data_queue_ofo(struct sock *sk, struct 
sk_buff *skb)
        }
 }
 
-static int __must_check tcp_queue_rcv(struct sock *sk, struct sk_buff *skb, 
int hdrlen,
-                 bool *fragstolen)
+static int __must_check tcp_queue_rcv(struct sock *sk, struct sk_buff *skb,
+                                     bool *fragstolen)
 {
        int eaten;
        struct sk_buff *tail = skb_peek_tail(&sk->sk_receive_queue);
 
-       __skb_pull(skb, hdrlen);
        eaten = (tail &&
                 tcp_try_coalesce(sk, tail,
                                  skb, fragstolen)) ? 1 : 0;
@@ -4660,7 +4659,7 @@ int tcp_send_rcvq(struct sock *sk, struct msghdr *msg, 
size_t size)
        TCP_SKB_CB(skb)->end_seq = TCP_SKB_CB(skb)->seq + size;
        TCP_SKB_CB(skb)->ack_seq = tcp_sk(sk)->snd_una - 1;
 
-       if (tcp_queue_rcv(sk, skb, 0, &fragstolen)) {
+       if (tcp_queue_rcv(sk, skb, &fragstolen)) {
                WARN_ON_ONCE(fragstolen); /* should not happen */
                __kfree_skb(skb);
        }
@@ -4720,7 +4719,7 @@ static void tcp_data_queue(struct sock *sk, struct 
sk_buff *skb)
                        goto drop;
                }
 
-               eaten = tcp_queue_rcv(sk, skb, 0, &fragstolen);
+               eaten = tcp_queue_rcv(sk, skb, &fragstolen);
                if (skb->len)
                        tcp_event_data_recv(sk, skb);
                if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN)
@@ -5596,8 +5595,8 @@ void tcp_rcv_established(struct sock *sk, struct sk_buff 
*skb)
                        NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPHPHITS);
 
                        /* Bulk data transfer: receiver */
-                       eaten = tcp_queue_rcv(sk, skb, tcp_header_len,
-                                             &fragstolen);
+                       __skb_pull(skb, tcp_header_len);
+                       eaten = tcp_queue_rcv(sk, skb, &fragstolen);
 
                        tcp_event_data_recv(sk, skb);
 
-- 
2.20.0.rc0.387.gc7a69e6b6c-goog