projects
/
platform
/
kernel
/
linux-exynos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
324b0af
)
NFC: Call llcp_add_header properly when sending LLCP DM or DISC
author
Samuel Ortiz
<sameo@linux.intel.com>
Tue, 10 Apr 2012 17:43:16 +0000
(19:43 +0200)
committer
John W. Linville
<linville@tuxdriver.com>
Thu, 12 Apr 2012 19:10:42 +0000
(15:10 -0400)
dsap and ssap were swapped when sending DN or DISC.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/nfc/llcp/commands.c
patch
|
blob
|
history
diff --git
a/net/nfc/llcp/commands.c
b/net/nfc/llcp/commands.c
index
34ee684
..
11a3b7d
100644
(file)
--- a/
net/nfc/llcp/commands.c
+++ b/
net/nfc/llcp/commands.c
@@
-248,7
+248,7
@@
int nfc_llcp_disconnect(struct nfc_llcp_sock *sock)
skb_reserve(skb, dev->tx_headroom + NFC_HEADER_SIZE);
- skb = llcp_add_header(skb, sock->
ssap, sock->d
sap, LLCP_PDU_DISC);
+ skb = llcp_add_header(skb, sock->
dsap, sock->s
sap, LLCP_PDU_DISC);
skb_queue_tail(&local->tx_queue, skb);
@@
-416,7
+416,7
@@
int nfc_llcp_send_dm(struct nfc_llcp_local *local, u8 ssap, u8 dsap, u8 reason)
skb_reserve(skb, dev->tx_headroom + NFC_HEADER_SIZE);
- skb = llcp_add_header(skb,
ssap, d
sap, LLCP_PDU_DM);
+ skb = llcp_add_header(skb,
dsap, s
sap, LLCP_PDU_DM);
memcpy(skb_put(skb, 1), &reason, 1);