NFC: llcp: Keep the connected socket parent pointer alive
authorSamuel Ortiz <sameo@linux.intel.com>
Tue, 26 Mar 2013 13:35:57 +0000 (14:35 +0100)
committerSamuel Ortiz <sameo@linux.intel.com>
Tue, 26 Mar 2013 13:35:57 +0000 (14:35 +0100)
And avoid decreasing the ack log twice when dequeueing connected LLCP
sockets.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
net/nfc/llcp/sock.c

index e488e440186aff11305785c9aa2025a6432f1724..8f025746f3370b4296c8064c603e06085adcb42e 100644 (file)
@@ -270,7 +270,9 @@ struct sock *nfc_llcp_accept_dequeue(struct sock *parent,
                }
 
                if (sk->sk_state == LLCP_CONNECTED || !newsock) {
-                       nfc_llcp_accept_unlink(sk);
+                       list_del_init(&lsk->accept_queue);
+                       sock_put(sk);
+
                        if (newsock)
                                sock_graft(sk, newsock);