diff options
| author | Eric Dumazet <edumazet@google.com> | 2020-09-30 05:54:56 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-09-30 14:21:30 -0700 |
| commit | b6b6d6533a14b5ddcf9f9c5239fc3721fc6beda0 (patch) | |
| tree | 3ebc44f6fa89883d9f46387b5e4337475790a1f8 /net/ipv4/tcp_output.c | |
| parent | 20c168be684a97b084525906eb7ed017b7f9c0b8 (diff) | |
| download | linux-b6b6d6533a14b5ddcf9f9c5239fc3721fc6beda0.tar.gz linux-b6b6d6533a14b5ddcf9f9c5239fc3721fc6beda0.tar.bz2 linux-b6b6d6533a14b5ddcf9f9c5239fc3721fc6beda0.zip | |
inet: remove icsk_ack.blocked
TCP has been using it to work around the possibility of tcp_delack_timer()
finding the socket owned by user.
After commit 6f458dfb4092 ("tcp: improve latencies of timer triggered events")
we added TCP_DELACK_TIMER_DEFERRED atomic bit for more immediate recovery,
so we can get rid of icsk_ack.blocked
This frees space that following patch will reuse.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_output.c')
| -rw-r--r-- | net/ipv4/tcp_output.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 386978dcd318..6bd4e383030e 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -3911,11 +3911,8 @@ void tcp_send_delayed_ack(struct sock *sk) /* Use new timeout only if there wasn't a older one earlier. */ if (icsk->icsk_ack.pending & ICSK_ACK_TIMER) { - /* If delack timer was blocked or is about to expire, - * send ACK now. - */ - if (icsk->icsk_ack.blocked || - time_before_eq(icsk->icsk_ack.timeout, jiffies + (ato >> 2))) { + /* If delack timer is about to expire, send ACK now. */ + if (time_before_eq(icsk->icsk_ack.timeout, jiffies + (ato >> 2))) { tcp_send_ack(sk); return; } |