diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-03-15 14:44:36 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-03-15 14:44:36 (GMT) |
| commit | f3a3440063d6b01470507ecde9cf8ed0b033362a (patch) | |
| tree | 11376f47f8db09adec4f80056137b07a811f0407 /net/nfc/llcp/sock.c | |
| parent | aaa0c23cb90141309f5076ba5e3bfbd39544b985 (diff) | |
| parent | 9437a248e7cac427c898bdb11bd1ac6844a1ead4 (diff) | |
| download | linux-f3a3440063d6b01470507ecde9cf8ed0b033362a.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/nfc/llcp/sock.c')
| -rw-r--r-- | net/nfc/llcp/sock.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/nfc/llcp/sock.c b/net/nfc/llcp/sock.c index 5332751..5c7cdf3f 100644 --- a/net/nfc/llcp/sock.c +++ b/net/nfc/llcp/sock.c @@ -278,6 +278,8 @@ struct sock *nfc_llcp_accept_dequeue(struct sock *parent, pr_debug("Returning sk state %d\n", sk->sk_state); + sk_acceptq_removed(parent); + return sk; } |