Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit c1be211727467882e0485ab062e712a3c1fba840

Authored by Waldemar Rymarkiewicz
Committed by Samuel Ortiz
1 parent ade672082d
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>
Acked-by: Eric Lapuyade <eric.lapuyade@intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

Showing 1 changed file with 1 additions and 2 deletions Side-by-side Diff

... ... @@ -240,8 +240,7 @@
240 240 pr_debug("ns reset to %d\n", shdlc->dnr);
241 241  
242 242 while ((skb = skb_dequeue_tail(&shdlc->ack_pending_q))) {
243   - skb_pull(skb, 2); /* remove len+control */
244   - skb_trim(skb, skb->len - 2); /* remove crc */
  243 + skb_pull(skb, 1); /* remove control field */
245 244 skb_queue_head(&shdlc->send_q, skb);
246 245 }
247 246 shdlc->ns = shdlc->dnr;