From f9bb8eb7c8469fbfd5580d3b721de41d1c2ed9be Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@linux.intel.com>
Date: Mon, 15 Oct 2012 15:09:52 +0200
Subject: [PATCH] --- yaml --- r: 340951 b: refs/heads/master c:
 c8512be63bbf9216934ecd10e1f9e4f887076fc2 h: refs/heads/master i:   340949:
 0169adecac715e48026521999739b9c9e53d0896   340947:
 9ab5da2eb7eed9236b262bc078b1352939cdf9ef   340943:
 3f54094daa51f1804eca3927ccee5fbffae23280 v: v3

---
 [refs]                    |  2 +-
 trunk/net/nfc/llcp/llcp.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ff80f25886ad..9e140200741d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54292d64e1b6cbe735852aaf59e56ef78dc15f82
+refs/heads/master: c8512be63bbf9216934ecd10e1f9e4f887076fc2
diff --git a/trunk/net/nfc/llcp/llcp.c b/trunk/net/nfc/llcp/llcp.c
index ee01be17e21f..7f92a857b319 100644
--- a/trunk/net/nfc/llcp/llcp.c
+++ b/trunk/net/nfc/llcp/llcp.c
@@ -85,6 +85,16 @@ static void nfc_llcp_socket_release(struct nfc_llcp_local *local, bool listen)
 			}
 		}
 
+		/*
+		 * If we have a connection less socket bound, we keep it alive
+		 * if the device is still present.
+		 */
+		if (sk->sk_state == LLCP_BOUND && sk->sk_type == SOCK_DGRAM &&
+		    listen == true) {
+			bh_unlock_sock(sk);
+			continue;
+		}
+
 		sk->sk_state = LLCP_CLOSED;
 
 		bh_unlock_sock(sk);