diff options
| author | Christophe Ricard | 2015-06-06 13:16:43 +0200 |
|---|---|---|
| committer | Samuel Ortiz | 2015-06-09 00:34:22 +0200 |
| commit | 09f39a950523b1bb830c30a8670b77e0067da092 (patch) | |
| tree | bb203eedacbff49a40f5d0fa8ee117229da21c70 /drivers/nfc | |
| parent | NFC: st21nfcb: Remove inappropriate kfree on a devm_kzalloc pointer (diff) | |
| download | kernel-qcow2-linux-09f39a950523b1bb830c30a8670b77e0067da092.tar.gz kernel-qcow2-linux-09f39a950523b1bb830c30a8670b77e0067da092.tar.xz kernel-qcow2-linux-09f39a950523b1bb830c30a8670b77e0067da092.zip | |
NFC: st21nfcb: Do not remove header once the payload is sent
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.
Cc: stable@vger.kernel.org
Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
| -rw-r--r-- | drivers/nfc/st21nfcb/i2c.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/nfc/st21nfcb/i2c.c b/drivers/nfc/st21nfcb/i2c.c index 76a4cad41cec..4bc15ec29b03 100644 --- a/drivers/nfc/st21nfcb/i2c.c +++ b/drivers/nfc/st21nfcb/i2c.c @@ -87,11 +87,6 @@ static void st21nfcb_nci_i2c_disable(void *phy_id) 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 *phy_id, struct sk_buff *skb) r = 0; } - st21nfcb_nci_remove_header(skb); - return r; } |