aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStanislaw Gruszka <sgruszka@redhat.com>2011-07-30 13:32:56 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-15 18:31:32 -0700
commite10eea625f8c07e5c9ec205cf2c6854d9c536b67 (patch)
tree9895b4bb5bad8155737f008ddcd38e359ef718ea
parentd4cf3443f9b390ae5b076a902059db190e980186 (diff)
downloadkernel_samsung_smdk4412-e10eea625f8c07e5c9ec205cf2c6854d9c536b67.zip
kernel_samsung_smdk4412-e10eea625f8c07e5c9ec205cf2c6854d9c536b67.tar.gz
kernel_samsung_smdk4412-e10eea625f8c07e5c9ec205cf2c6854d9c536b67.tar.bz2
rt2x00: rt2800: fix zeroing skb structure
commit b52398b6e4522176dd125722c72c301015d24520 upstream. We should clear skb->data not skb itself. Bug was introduced by: commit 0b8004aa12d13ec750d102ba4082a95f0107c649 "rt2x00: Properly reserve room for descriptors in skbs". Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.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> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/net/wireless/rt2x00/rt2800lib.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index 2a6aa85..5a45228 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -784,8 +784,7 @@ void rt2800_write_beacon(struct queue_entry *entry, struct txentry_desc *txdesc)
/*
* Add space for the TXWI in front of the skb.
*/
- skb_push(entry->skb, TXWI_DESC_SIZE);
- memset(entry->skb, 0, TXWI_DESC_SIZE);
+ memset(skb_push(entry->skb, TXWI_DESC_SIZE), 0, TXWI_DESC_SIZE);
/*
* Register descriptor details in skb frame descriptor.