aboutsummaryrefslogtreecommitdiffstats
path: root/net/nfc
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2012-03-04 19:03:40 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-03-06 15:16:21 -0500
commitb9a76f1d3c6da47b2fa115ff1c0de229e8d06f8f (patch)
treebd1859606e3e808c47fe87b77a157613f2b9b9c6 /net/nfc
parent98b3ac1b980b0c0ffff24fda8d13ab8c216df4d1 (diff)
NFC: Clear LLCP SDPs whan MAC goes down
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/nfc')
-rw-r--r--net/nfc/llcp/llcp.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/net/nfc/llcp/llcp.c b/net/nfc/llcp/llcp.c
index 443407e964ca..577bcb92ea9b 100644
--- a/net/nfc/llcp/llcp.c
+++ b/net/nfc/llcp/llcp.c
@@ -97,6 +97,17 @@ static void nfc_llcp_socket_release(struct nfc_llcp_local *local)
97 mutex_unlock(&local->socket_lock); 97 mutex_unlock(&local->socket_lock);
98} 98}
99 99
100static void nfc_llcp_clear_sdp(struct nfc_llcp_local *local)
101{
102 mutex_lock(&local->sdp_lock);
103
104 local->local_wks = 0;
105 local->local_sdp = 0;
106 local->local_sap = 0;
107
108 mutex_unlock(&local->sdp_lock);
109}
110
100static void nfc_llcp_timeout_work(struct work_struct *work) 111static void nfc_llcp_timeout_work(struct work_struct *work)
101{ 112{
102 struct nfc_llcp_local *local = container_of(work, struct nfc_llcp_local, 113 struct nfc_llcp_local *local = container_of(work, struct nfc_llcp_local,
@@ -857,6 +868,8 @@ void nfc_llcp_mac_is_down(struct nfc_dev *dev)
857 if (local == NULL) 868 if (local == NULL)
858 return; 869 return;
859 870
871 nfc_llcp_clear_sdp(local);
872
860 /* Close and purge all existing sockets */ 873 /* Close and purge all existing sockets */
861 nfc_llcp_socket_release(local); 874 nfc_llcp_socket_release(local);
862} 875}