Patch "NFC: st21nfcb: Do not remove header once the payload is sent" has been added to the 4.1-stable tree

Patch "NFC: st21nfcb: Do not remove header once the payload is sent" has been added to the 4.1-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    NFC: st21nfcb: Do not remove header once the payload is sent

to the 4.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     nfc-st21nfcb-do-not-remove-header-once-the-payload-is-sent.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 09f39a950523b1bb830c30a8670b77e0067da092 Mon Sep 17 00:00:00 2001
From: Christophe Ricard <christophe.ricard@gmail.com>
Date: Sat, 6 Jun 2015 13:16:43 +0200
Subject: NFC: st21nfcb: Do not remove header once the payload is sent

From: Christophe Ricard <christophe.ricard@gmail.com>

commit 09f39a950523b1bb830c30a8670b77e0067da092 upstream.

Once the data is sent, we need to preserve the full frame for
the ndlc state machine. If the NDLC ACK is not received in time,
the ndlc layer will resend the same frame.
Having the header byte pulled will corrupt the frame.

Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/nfc/st21nfcb/i2c.c |    7 -------
 1 file changed, 7 deletions(-)

--- a/drivers/nfc/st21nfcb/i2c.c
+++ b/drivers/nfc/st21nfcb/i2c.c
@@ -87,11 +87,6 @@ static void st21nfcb_nci_i2c_disable(voi
 	gpio_set_value(phy->gpio_reset, 1);
 }
 
-static void st21nfcb_nci_remove_header(struct sk_buff *skb)
-{
-	skb_pull(skb, ST21NFCB_FRAME_HEADROOM);
-}
-
 /*
  * Writing a frame must not return the number of written bytes.
  * It must return either zero for success, or <0 for error.
@@ -121,8 +116,6 @@ static int st21nfcb_nci_i2c_write(void *
 			r = 0;
 	}
 
-	st21nfcb_nci_remove_header(skb);
-
 	return r;
 }
 


Patches currently in stable-queue which might be from christophe.ricard@gmail.com are

queue-4.1/nfc-st21nfcb-remove-st21nfcb_nci_i2c_disable.patch
queue-4.1/nfc-st21nfcb-do-not-remove-header-once-the-payload-is-sent.patch