From 1c5bac9b0c11891f4c329da5d4881a1a1c6c353a Mon Sep 17 00:00:00 2001
From: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>
Date: Fri, 7 Sep 2012 11:08:30 +0200
Subject: [PATCH] --- yaml --- r: 328274 b: refs/heads/master c:
 c1be211727467882e0485ab062e712a3c1fba840 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/nfc/hci/shdlc.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5b1bbc63aeb3..c4a18469f429 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ade672082dd35aaaf7c8630d16c9f795c30459c4
+refs/heads/master: c1be211727467882e0485ab062e712a3c1fba840
diff --git a/trunk/net/nfc/hci/shdlc.c b/trunk/net/nfc/hci/shdlc.c
index ed8796b78f39..9357ba7362f6 100644
--- a/trunk/net/nfc/hci/shdlc.c
+++ b/trunk/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;