Message ID | 1727999090-19845-1-git-send-email-guoxin0309@gmail.com (mailing list archive) |
---|---|
State | Not Applicable |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net-next,v2] tcp: remove unnecessary update for tp->write_seq in tcp_connect() Commit 783237e8daf13("net-tcp: Fast Open client - sending SYN-data") introduces tcp_connect_queue_skb() and it would overwrite tcp->write_seq, so it is no need to update tp->w | expand |
Sorry for this post, please ignore it, On Fri, Oct 4, 2024 at 7:44 AM xin.guo <guoxin0309@gmail.com> wrote: > > From: "xin.guo" <guoxin0309@gmail.com> > > Signed-off-by: xin.guo <guoxin0309@gmail.com> > --- > net/ipv4/tcp_output.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c > index 4fd746b..3265f34 100644 > --- a/net/ipv4/tcp_output.c > +++ b/net/ipv4/tcp_output.c > @@ -4133,8 +4133,11 @@ int tcp_connect(struct sock *sk) > buff = tcp_stream_alloc_skb(sk, sk->sk_allocation, true); > if (unlikely(!buff)) > return -ENOBUFS; > - > - tcp_init_nondata_skb(buff, tp->write_seq++, TCPHDR_SYN); > + > + /*SYN eats a sequence byte, write_seq updated by > + *tcp_connect_queue_skb() > + */ > + tcp_init_nondata_skb(buff, tp->write_seq, TCPHDR_SYN); > tcp_mstamp_refresh(tp); > tp->retrans_stamp = tcp_time_stamp_ts(tp); > tcp_connect_queue_skb(sk, buff); > -- > 1.8.3.1 >
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 4fd746b..3265f34 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -4133,8 +4133,11 @@ int tcp_connect(struct sock *sk) buff = tcp_stream_alloc_skb(sk, sk->sk_allocation, true); if (unlikely(!buff)) return -ENOBUFS; - - tcp_init_nondata_skb(buff, tp->write_seq++, TCPHDR_SYN); + + /*SYN eats a sequence byte, write_seq updated by + *tcp_connect_queue_skb() + */ + tcp_init_nondata_skb(buff, tp->write_seq, TCPHDR_SYN); tcp_mstamp_refresh(tp); tp->retrans_stamp = tcp_time_stamp_ts(tp); tcp_connect_queue_skb(sk, buff);