diff options
author | Eric Dumazet <edumazet@google.com> | 2015-07-08 17:28:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-07-09 18:12:20 -0400 |
commit | dbe7faa4045ea83a37b691b12bb02a8f86c2d2e9 (patch) | |
tree | 4c7b8918dbe2c4caacd120deffe2e8a8235d9561 /net/ipv4/tcp_ipv4.c | |
parent | fc01538f9fb75572c969ca9988176ffc2a8741d6 (diff) |
inet: inet_twsk_deschedule factorization
inet_twsk_deschedule() calls are followed by inet_twsk_put().
Only particular case is in inet_twsk_purge() but there is no point
to defer the inet_twsk_put() after re-enabling BH.
Lets rename inet_twsk_deschedule() to inet_twsk_deschedule_put()
and move the inet_twsk_put() inside.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index d7d4c2b79cf2..486ba96ae91a 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -1683,8 +1683,7 @@ do_time_wait: | |||
1683 | iph->daddr, th->dest, | 1683 | iph->daddr, th->dest, |
1684 | inet_iif(skb)); | 1684 | inet_iif(skb)); |
1685 | if (sk2) { | 1685 | if (sk2) { |
1686 | inet_twsk_deschedule(inet_twsk(sk)); | 1686 | inet_twsk_deschedule_put(inet_twsk(sk)); |
1687 | inet_twsk_put(inet_twsk(sk)); | ||
1688 | sk = sk2; | 1687 | sk = sk2; |
1689 | goto process; | 1688 | goto process; |
1690 | } | 1689 | } |