diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-05-06 17:29:38 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-06 17:29:38 -0700 |
| commit | ee733cd8963903c494cbe1b43894eaa152932324 (patch) | |
| tree | 098d0ead6696790e52d5789abe5609dfbbfce83c /net/ipv4/tcp_input.c | |
| parent | arm64: dts: sdm845: add IPA iommus property (diff) | |
| parent | tcp: defer xmit timer reset in tcp_xmit_retransmit_queue() (diff) | |
| download | wireguard-linux-ee733cd8963903c494cbe1b43894eaa152932324.tar.xz wireguard-linux-ee733cd8963903c494cbe1b43894eaa152932324.zip | |
Merge branch 'tcp-minor-adjustments-for-low-pacing-rates'
Eric Dumazet says:
====================
tcp: minor adjustments for low pacing rates
After pacing horizon addition, we have to adjust how we arm rto
timer, otherwise we might freeze very low pacing rate flows.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index d68128a672ab..7d205b2a733c 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -3014,7 +3014,7 @@ void tcp_rearm_rto(struct sock *sk) rto = usecs_to_jiffies(max_t(int, delta_us, 1)); } tcp_reset_xmit_timer(sk, ICSK_TIME_RETRANS, rto, - TCP_RTO_MAX, tcp_rtx_queue_head(sk)); + TCP_RTO_MAX); } } @@ -3291,7 +3291,7 @@ static void tcp_ack_probe(struct sock *sk) unsigned long when = tcp_probe0_when(sk, TCP_RTO_MAX); tcp_reset_xmit_timer(sk, ICSK_TIME_PROBE0, - when, TCP_RTO_MAX, NULL); + when, TCP_RTO_MAX); } } |