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/dccp/timer.c | |
parent | 20c168be684a97b084525906eb7ed017b7f9c0b8 (diff) | |
download | lwn-b6b6d6533a14b5ddcf9f9c5239fc3721fc6beda0.tar.gz lwn-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/dccp/timer.c')
-rw-r--r-- | net/dccp/timer.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/dccp/timer.c b/net/dccp/timer.c index 927c796d7682..a934d2932373 100644 --- a/net/dccp/timer.c +++ b/net/dccp/timer.c @@ -176,7 +176,6 @@ static void dccp_delack_timer(struct timer_list *t) bh_lock_sock(sk); if (sock_owned_by_user(sk)) { /* Try again later. */ - icsk->icsk_ack.blocked = 1; __NET_INC_STATS(sock_net(sk), LINUX_MIB_DELAYEDACKLOCKED); sk_reset_timer(sk, &icsk->icsk_delack_timer, jiffies + TCP_DELACK_MIN); |