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/ipv6/tcp_ipv6.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/ipv6/tcp_ipv6.c')
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 6748c4277aff..d540846a1a79 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
@@ -1481,8 +1481,7 @@ do_time_wait: | |||
1481 | ntohs(th->dest), tcp_v6_iif(skb)); | 1481 | ntohs(th->dest), tcp_v6_iif(skb)); |
1482 | if (sk2) { | 1482 | if (sk2) { |
1483 | struct inet_timewait_sock *tw = inet_twsk(sk); | 1483 | struct inet_timewait_sock *tw = inet_twsk(sk); |
1484 | inet_twsk_deschedule(tw); | 1484 | inet_twsk_deschedule_put(tw); |
1485 | inet_twsk_put(tw); | ||
1486 | sk = sk2; | 1485 | sk = sk2; |
1487 | tcp_v6_restore_cb(skb); | 1486 | tcp_v6_restore_cb(skb); |
1488 | goto process; | 1487 | goto process; |