diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2012-03-05 01:03:40 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-03-06 15:16:21 -0500 |
| commit | b9a76f1d3c6da47b2fa115ff1c0de229e8d06f8f (patch) | |
| tree | bd1859606e3e808c47fe87b77a157613f2b9b9c6 /net/nfc | |
| parent | 98b3ac1b980b0c0ffff24fda8d13ab8c216df4d1 (diff) | |
| download | lwn-b9a76f1d3c6da47b2fa115ff1c0de229e8d06f8f.tar.gz lwn-b9a76f1d3c6da47b2fa115ff1c0de229e8d06f8f.zip | |
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.c | 13 |
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) mutex_unlock(&local->socket_lock); } +static void nfc_llcp_clear_sdp(struct nfc_llcp_local *local) +{ + mutex_lock(&local->sdp_lock); + + local->local_wks = 0; + local->local_sdp = 0; + local->local_sap = 0; + + mutex_unlock(&local->sdp_lock); +} + static void nfc_llcp_timeout_work(struct work_struct *work) { 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) if (local == NULL) return; + nfc_llcp_clear_sdp(local); + /* Close and purge all existing sockets */ nfc_llcp_socket_release(local); } |