aboutsummaryrefslogtreecommitdiff
path: root/net/nfc
diff options
context:
space:
mode:
authorGravatar Samuel Ortiz <sameo@linux.intel.com> 2013-02-21 11:04:45 +0100
committerGravatar Samuel Ortiz <sameo@linux.intel.com> 2013-03-08 14:25:04 +0100
commitb141e811a0763bb107af4cd99d456193ccdb8053 (patch)
tree47ee1d81202a4e125b86f38250f5d71c7c5faacd /net/nfc
parentMerge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin... (diff)
downloadlinux-b141e811a0763bb107af4cd99d456193ccdb8053.tar.gz
linux-b141e811a0763bb107af4cd99d456193ccdb8053.tar.bz2
linux-b141e811a0763bb107af4cd99d456193ccdb8053.zip
NFC: llcp: Decrease socket ack log when accepting a connection
This is really difficult to test with real NFC devices, but without this fix an LLCP server will eventually refuse new connections. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc')
-rw-r--r--net/nfc/llcp/sock.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/nfc/llcp/sock.c b/net/nfc/llcp/sock.c
index 5332751943a9..5c7cdf3f2a83 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;
}