diff options
| author | Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com> | 2012-09-07 11:08:30 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-09-25 00:17:24 +0200 |
| commit | c1be211727467882e0485ab062e712a3c1fba840 (patch) | |
| tree | 1f10350990036968fbda9f96bc77efb14f3181e8 /net/nfc/hci | |
| parent | ade672082dd35aaaf7c8630d16c9f795c30459c4 (diff) | |
| download | op-kernel-dev-c1be211727467882e0485ab062e712a3c1fba840.zip op-kernel-dev-c1be211727467882e0485ab062e712a3c1fba840.tar.gz | |
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/nfc/hci')
| -rw-r--r-- | net/nfc/hci/shdlc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/nfc/hci/shdlc.c b/net/nfc/hci/shdlc.c index ed8796b..9357ba7 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; |
