diff options
| author | David S. Miller <davem@davemloft.net> | 2011-08-03 16:36:41 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-03 16:36:41 -0700 |
| commit | 5be1334062a2f358dc65016b5181e6edbfe3bd1e (patch) | |
| tree | 02ec7afd0cacda2f364e49f0c8391690f6b41a24 /drivers/net/wireless/rt2x00/rt2800lib.c | |
| parent | f2c31e32b378a6653f8de606149d963baf11d7d3 (diff) | |
| parent | a5d5a914770a81a1f775be2ee35b9fa8fd19d381 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
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 84ab7d1acb6..ef67f6786a8 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. |