diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-08-03 15:18:21 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-08-03 15:18:21 +0200 |
| commit | a5d5a914770a81a1f775be2ee35b9fa8fd19d381 (patch) | |
| tree | ed07597966e91e3903faf305d69a2c5e1d109b91 /drivers/net/wireless/rt2x00/rt2800lib.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | iwlagn: 5000 do not support idle mode (diff) | |
| download | linux-a5d5a914770a81a1f775be2ee35b9fa8fd19d381.tar.xz linux-a5d5a914770a81a1f775be2ee35b9fa8fd19d381.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2800lib.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2800lib.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index 84ab7d1acb6a..ef67f6786a84 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c @@ -703,8 +703,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. |