diff options
| author | Jakub Kicinski <[email protected]> | 2024-06-20 20:02:22 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2024-06-20 20:49:59 +0000 |
| commit | a6ec08beec9ea93f342d6daeac922208709694dc (patch) | |
| tree | e14f4b7f0133e63a20a27baea37506abeba3bb95 /net/ipv4/tcp_input.c | |
| parent | igb: Add MII write support (diff) | |
| parent | Merge tag 'net-6.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
| download | kernel-a6ec08beec9ea93f342d6daeac922208709694dc.tar.gz kernel-a6ec08beec9ea93f342d6daeac922208709694dc.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
Conflicts:
drivers/net/ethernet/broadcom/bnxt/bnxt.c
1e7962114c10 ("bnxt_en: Restore PTP tx_avail count in case of skb_pad() error")
165f87691a89 ("bnxt_en: add timestamping statistics support")
No adjacent changes.
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index f513d1f927ad..bfd390c86d84 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -6305,6 +6305,7 @@ static bool tcp_rcv_fastopen_synack(struct sock *sk, struct sk_buff *synack, skb_rbtree_walk_from(data) tcp_mark_skb_lost(sk, data); tcp_xmit_retransmit_queue(sk); + tp->retrans_stamp = 0; NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPFASTOPENACTIVEFAIL); return true; |