lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NFC: Fix bitops usage in LLCP

Browse Source 
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Samuel Ortiz
2012-03-05 01:03:38 +01:00
committed by John W. Linville
parent 53a0ac2ee8
commit 1762c17c9c
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
net/nfc/llcp/llcp.c
View File

@@ -176,7 +176,7 @@ u8 nfc_llcp_get_sdp_ssap(struct nfc_llcp_local *local,
return LLCP_SAP_MAX; return LLCP_SAP_MAX;
} }
set_bit(BIT(ssap), &local->local_wks); set_bit(ssap, &local->local_wks);
mutex_unlock(&local->sdp_lock); mutex_unlock(&local->sdp_lock);
return ssap; return ssap;
@@ -195,25 +195,25 @@ u8 nfc_llcp_get_sdp_ssap(struct nfc_llcp_local *local,
pr_debug("SDP ssap %d\n", LLCP_WKS_NUM_SAP + ssap); pr_debug("SDP ssap %d\n", LLCP_WKS_NUM_SAP + ssap);
set_bit(BIT(ssap), &local->local_sdp); set_bit(ssap, &local->local_sdp);
mutex_unlock(&local->sdp_lock); mutex_unlock(&local->sdp_lock);
return LLCP_WKS_NUM_SAP + ssap; return LLCP_WKS_NUM_SAP + ssap;
} else if (sock->ssap != 0) { } else if (sock->ssap != 0) {
if (sock->ssap < LLCP_WKS_NUM_SAP) { if (sock->ssap < LLCP_WKS_NUM_SAP) {
if (!(local->local_wks & BIT(sock->ssap))) { if (!test_bit(sock->ssap, &local->local_wks)) {
set_bit(BIT(sock->ssap), &local->local_wks); set_bit(sock->ssap, &local->local_wks);
mutex_unlock(&local->sdp_lock); mutex_unlock(&local->sdp_lock);
return sock->ssap; return sock->ssap;
} }
} else if (sock->ssap < LLCP_SDP_NUM_SAP) { } else if (sock->ssap < LLCP_SDP_NUM_SAP) {
if (!(local->local_sdp & if (!test_bit(sock->ssap - LLCP_WKS_NUM_SAP,
BIT(sock->ssap - LLCP_WKS_NUM_SAP))) { &local->local_sdp)) {
set_bit(BIT(sock->ssap - LLCP_WKS_NUM_SAP), set_bit(sock->ssap - LLCP_WKS_NUM_SAP,
&local->local_sdp); &local->local_sdp);
mutex_unlock(&local->sdp_lock); mutex_unlock(&local->sdp_lock);
return sock->ssap; return sock->ssap;
@@ -238,7 +238,7 @@ u8 nfc_llcp_get_local_ssap(struct nfc_llcp_local *local)
return LLCP_SAP_MAX; return LLCP_SAP_MAX;
} }
set_bit(BIT(local_ssap), &local->local_sap); set_bit(local_ssap, &local->local_sap);
mutex_unlock(&local->sdp_lock); mutex_unlock(&local->sdp_lock);
@@ -265,7 +265,7 @@ void nfc_llcp_put_ssap(struct nfc_llcp_local *local, u8 ssap)
mutex_lock(&local->sdp_lock); mutex_lock(&local->sdp_lock);
clear_bit(1 << local_ssap, sdp); clear_bit(local_ssap, sdp);
mutex_unlock(&local->sdp_lock); mutex_unlock(&local->sdp_lock);
} }