diff options
| author | Mark Brown <broonie@kernel.org> | 2024-06-03 14:45:04 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-06-03 14:45:04 +0300 |
| commit | 4ac0f06ca044e3ca938681a0eeb7d52a68b0b30f (patch) | |
| tree | 9433afff899211152ff78ed38f9a70ab2bb497fc /net/ipv4/tcp_ipv4.c | |
| parent | 34864c05a54d1bc544c8c3939aababbc481d99e3 (diff) | |
| parent | c3f38fa61af77b49866b006939479069cd451173 (diff) | |
| download | linux-4ac0f06ca044e3ca938681a0eeb7d52a68b0b30f.tar.xz | |
ASoC: Merge up fixes
We need this to get the i.MX platforms working in CI again.
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 30ef0c8f5e92..b710958393e6 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -1144,14 +1144,9 @@ static void tcp_v4_reqsk_send_ack(const struct sock *sk, struct sk_buff *skb, #endif } - /* RFC 7323 2.3 - * The window field (SEG.WND) of every outgoing segment, with the - * exception of <SYN> segments, MUST be right-shifted by - * Rcv.Wind.Shift bits: - */ tcp_v4_send_ack(sk, skb, seq, tcp_rsk(req)->rcv_nxt, - req->rsk_rcv_wnd >> inet_rsk(req)->rcv_wscale, + tcp_synack_window(req) >> inet_rsk(req)->rcv_wscale, tcp_rsk_tsval(tcp_rsk(req)), READ_ONCE(req->ts_recent), 0, &key, |