diff options
| author | Eric Dumazet <[email protected]> | 2015-07-08 21:28:30 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2015-07-09 22:12:20 +0000 |
| commit | dbe7faa4045ea83a37b691b12bb02a8f86c2d2e9 (patch) | |
| tree | 4c7b8918dbe2c4caacd120deffe2e8a8235d9561 /net/ipv6/tcp_ipv6.c | |
| parent | inet: simplify timewait refcounting (diff) | |
| download | kernel-dbe7faa4045ea83a37b691b12bb02a8f86c2d2e9.tar.gz kernel-dbe7faa4045ea83a37b691b12bb02a8f86c2d2e9.zip | |
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 <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
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: ntohs(th->dest), tcp_v6_iif(skb)); if (sk2) { struct inet_timewait_sock *tw = inet_twsk(sk); - inet_twsk_deschedule(tw); - inet_twsk_put(tw); + inet_twsk_deschedule_put(tw); sk = sk2; tcp_v6_restore_cb(skb); goto process; |