Commit c1be2117 authored by Waldemar Rymarkiewicz's avatar Waldemar Rymarkiewicz Committed by Samuel Ortiz
Browse files

NFC: Correct outgoing frame before requeueing 



Driver must handle its data added to the frame, so at this point
removeing control field of shdlc frame is enough.

Signed-off-by: default avatarWaldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>
Acked-by: default avatarEric Lapuyade <eric.lapuyade@intel.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent ade67208

net/nfc/hci/shdlc.c

+1 −2
Original line number Diff line number Diff line
@@ -240,8 +240,7 @@ static void nfc_shdlc_requeue_ack_pending(struct nfc_shdlc *shdlc) 
	pr_debug("ns reset to %d\n", shdlc->dnr);



	while ((skb = skb_dequeue_tail(&shdlc->ack_pending_q))) {

		skb_pull(skb, 2);	/* remove len+control */

		skb_trim(skb, skb->len - 2);	/* remove crc */

		skb_pull(skb, 1);  /* remove control field */

		skb_queue_head(&shdlc->send_q, skb);

	}

	shdlc->ns = shdlc->dnr;