Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffc29315 authored by Samuel Ortiz's avatar Samuel Ortiz Committed by John W. Linville
Browse files

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: default avatarSamuel Ortiz <sameo@linux.intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 324b0af6

net/nfc/llcp/commands.c

+2 −2
Original line number Diff line number Diff line
@@ -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);