summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorWaldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>2012-09-07 13:08:30 +0400
committerSamuel Ortiz <sameo@linux.intel.com>2012-09-25 02:17:24 +0400
commitc1be211727467882e0485ab062e712a3c1fba840 (patch)
tree1f10350990036968fbda9f96bc77efb14f3181e8 /net
parentade672082dd35aaaf7c8630d16c9f795c30459c4 (diff)
downloadlinux-c1be211727467882e0485ab062e712a3c1fba840.tar.xz
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>
Diffstat (limited to 'net')
-rw-r--r--net/nfc/hci/shdlc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/nfc/hci/shdlc.c b/net/nfc/hci/shdlc.c
index ed8796b78f39..9357ba7362f6 100644
--- a/net/nfc/hci/shdlc.c
+++ b/net/nfc/hci/shdlc.c
@@ -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;