From: Samuel Ortiz Date: Tue, 10 Apr 2012 17:43:16 +0000 (+0200) Subject: NFC: Call llcp_add_header properly when sending LLCP DM or DISC X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ffc29315e5b665d3e7e17d6156ac82f85a6d0205;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git 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 Signed-off-by: John W. Linville --- diff --git a/net/nfc/llcp/commands.c b/net/nfc/llcp/commands.c index 34ee6847806a..11a3b7d98dc5 100644 --- 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->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 @@ 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, dsap, LLCP_PDU_DM); + skb = llcp_add_header(skb, dsap, ssap, LLCP_PDU_DM); memcpy(skb_put(skb, 1), &reason, 1);