diff options
| author | Eric Dumazet <edumazet@google.com> | 2013-10-11 17:54:49 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-10-17 21:02:02 +0200 |
| commit | c1d607cc4a8ea1ef89d7f6f5728112bc5a52f2f6 (patch) | |
| tree | 4428d703936d39735d9122252357eb94b1d0a435 /net/ipv4/inet_diag.c | |
| parent | Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge (diff) | |
| download | linux-c1d607cc4a8ea1ef89d7f6f5728112bc5a52f2f6.tar.xz linux-c1d607cc4a8ea1ef89d7f6f5728112bc5a52f2f6.zip | |
inet_diag: use sock_gen_put()
TCP listener refactoring, part 6 :
Use sock_gen_put() from inet_diag_dump_one_icsk() for future
SYN_RECV support.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inet_diag.c')
| -rw-r--r-- | net/ipv4/inet_diag.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c index 41e1c3ea8b51..56a964a553d2 100644 --- a/net/ipv4/inet_diag.c +++ b/net/ipv4/inet_diag.c @@ -336,12 +336,9 @@ int inet_diag_dump_one_icsk(struct inet_hashinfo *hashinfo, struct sk_buff *in_s err = 0; out: - if (sk) { - if (sk->sk_state == TCP_TIME_WAIT) - inet_twsk_put((struct inet_timewait_sock *)sk); - else - sock_put(sk); - } + if (sk) + sock_gen_put(sk); + out_nosk: return err; } |