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/inet_connection_sock.c | |
| parent | net: macb: move pdata to private header (diff) | |
| download | linux-dev-b6b6d6533a14b5ddcf9f9c5239fc3721fc6beda0.tar.xz linux-dev-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/inet_connection_sock.c')
| -rw-r--r-- | net/ipv4/inet_connection_sock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index b457dd2d6c75..4148f5f78f31 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -564,7 +564,7 @@ void inet_csk_clear_xmit_timers(struct sock *sk) { struct inet_connection_sock *icsk = inet_csk(sk); - icsk->icsk_pending = icsk->icsk_ack.pending = icsk->icsk_ack.blocked = 0; + icsk->icsk_pending = icsk->icsk_ack.pending = 0; sk_stop_timer(sk, &icsk->icsk_retransmit_timer); sk_stop_timer(sk, &icsk->icsk_delack_timer); |