commit ffc29315e5b665d3e7e17d6156ac82f85a6d0205
author Samuel Ortiz <sameo@linux.intel.com> Tue Apr 10 19:43:16 2012 +0200
committer John W. Linville <linville@tuxdriver.com> Thu Apr 12 15:10:42 2012 -0400
tree c3d248afb8d39c3e2f9f1e29344a2a16ae84d273
parent 324b0af6f5a48dc38dac016eed14d019cac5903f

NFC: Call llcp_add_header properly when sending LLCP DM or DISC

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

diff --git a/net/nfc/llcp/commands.c b/net/nfc/llcp/commands.c
index 34ee684..11a3b7d 100644
--- a/net/nfc/llcp/commands.c
+++ b/net/nfc/llcp/commands.c
@@ -248,7 +248,7 @@
 
 	skb_reserve(skb, dev->tx_headroom + NFC_HEADER_SIZE);
 
-	skb = llcp_add_header(skb, sock->ssap, sock->dsap, LLCP_PDU_DISC);
+	skb = llcp_add_header(skb, sock->dsap, sock->ssap, LLCP_PDU_DISC);
 
 	skb_queue_tail(&local->tx_queue, skb);
 
@@ -416,7 +416,7 @@
 
 	skb_reserve(skb, dev->tx_headroom + NFC_HEADER_SIZE);
 
-	skb = llcp_add_header(skb, ssap, dsap, LLCP_PDU_DM);
+	skb = llcp_add_header(skb, dsap, ssap, LLCP_PDU_DM);
 
 	memcpy(skb_put(skb, 1), &reason, 1);