2018-07-14 08:37:40

by Yafang Shao

Subject: [PATCH net-next] tcp: remove redundant rcv_nxt update

tcp_rcv_nxt_update() is already executed in tcp_data_queue().
This line is redundant.

See bellow,
tcp_queue_rcv
tcp_rcv_nxt_update(tcp_sk(sk), TCP_SKB_CB(skb)->end_seq);
tcp_rcv_nxt_update(tp, TCP_SKB_CB(skb)->end_seq); <<<< redundant

Signed-off-by: Yafang Shao <[email protected]>
Signed-off-by: Eric Dumazet <[email protected]>
---
net/ipv4/tcp_input.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 814ea43..3a54faf 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -4695,7 +4695,6 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb)
}

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);
if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN)
--
1.8.3.1

2018-07-14 18:22:55

by David Miller

Subject: Re: [PATCH net-next] tcp: remove redundant rcv_nxt update

From: Yafang Shao <[email protected]>
Date: Sat, 14 Jul 2018 16:36:29 +0800

> tcp_rcv_nxt_update() is already executed in tcp_data_queue().
> This line is redundant.
>
> See bellow,
> tcp_queue_rcv
> tcp_rcv_nxt_update(tcp_sk(sk), TCP_SKB_CB(skb)->end_seq);
> tcp_rcv_nxt_update(tp, TCP_SKB_CB(skb)->end_seq); <<<< redundant
>
> Signed-off-by: Yafang Shao <[email protected]>
> Signed-off-by: Eric Dumazet <[email protected]>

Applied.