]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
NFC: Clear LLCP SDPs whan MAC goes down
authorSamuel Ortiz <sameo@linux.intel.com>
Mon, 5 Mar 2012 00:03:40 +0000 (01:03 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 6 Mar 2012 20:16:21 +0000 (15:16 -0500)
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/nfc/llcp/llcp.c

index 443407e964ca24692fa371755e9e4568977b3f16..577bcb92ea9bd8f735e362c70bc2bd312f9b2e43 100644 (file)
@@ -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);
 }