From: Samuel Ortiz <sameo@linux.intel.com>
Date: Tue, 26 Mar 2013 13:35:57 +0000 (+0100)
Subject: NFC: llcp: Keep the connected socket parent pointer alive
X-Git-Tag: upstream/snapshot3+hdmi~5323^2~11^2^2~18^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=39a352a5b5896403ad4ce842a9bc3845a01c02cd;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

NFC: llcp: Keep the connected socket parent pointer alive

And avoid decreasing the ack log twice when dequeueing connected LLCP
sockets.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
---

diff --git a/net/nfc/llcp/sock.c b/net/nfc/llcp/sock.c
index e488e44..8f02574 100644
--- a/net/nfc/llcp/sock.c
+++ b/net/nfc/llcp/sock.c
@@ -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);