aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00/rt2800usb.c
diff options
context:
space:
mode:
authorAlban Browaeys <prahal@yahoo.com>2009-12-04 23:47:00 +0100
committerJohn W. Linville <linville@tuxdriver.com>2009-12-21 18:56:29 -0500
commit1398d4580eff2656f3a808ec24744ce5a842db35 (patch)
tree3d11eac574e232219f5ca512d1572130c242834c /drivers/net/wireless/rt2x00/rt2800usb.c
parente81e0aef32bfa7f593b14479b9c7eaa7196798ac (diff)
downloadkernel_samsung_smdk4412-1398d4580eff2656f3a808ec24744ce5a842db35.tar.gz
kernel_samsung_smdk4412-1398d4580eff2656f3a808ec24744ce5a842db35.tar.bz2
kernel_samsung_smdk4412-1398d4580eff2656f3a808ec24744ce5a842db35.zip
rt2x00 : trim the skb after having the l2pad removed.
Otherwise we end up truncating the skb before removing the l2pad thus we might have the truncated part become garbage while getting it back in remove_l2pad. For the same issue: remove the skb_trim from the rt2800 fill_rxdone (it is done after l2pad removal in rt2x00lib_rxdone). Signed-off-by: Alban Browaeys <prahal@yahoo.com> Acked-by: Gertjan van Wingerde <gwingerde@gmail.com> Acked-by: Ivo van Doorn <ivdoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2800usb.c')
-rw-r--r--drivers/net/wireless/rt2x00/rt2800usb.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index af85d18cdbe..1db8667a6ff 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -663,7 +663,6 @@ static void rt2800usb_fill_rxdone(struct queue_entry *entry,
* Remove RXWI descriptor from start of buffer.
*/
skb_pull(entry->skb, skbdesc->desc_len);
- skb_trim(entry->skb, rxdesc->size);
}
/*