From 072f853a9375410b8e8ca93a691a6dc9ce36672e Mon Sep 17 00:00:00 2001
From: Stanislaw Gruszka <sgruszka@redhat.com>
Date: Sat, 30 Jul 2011 13:32:56 +0200
Subject: [PATCH] --- yaml --- r: 262471 b: refs/heads/master c:
 b52398b6e4522176dd125722c72c301015d24520 h: refs/heads/master i:   262469:
 6663e83cf49ec064e063d307204a4a840861b87e   262467:
 ffc3ed3480240f6f4ca2a79c7d86035eb4e08c6a   262463:
 f56bdbcb9c7061c9627b3afcdd22e3701ae46346 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/wireless/rt2x00/rt2800lib.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 720eedfb7576..8bc3d55ffc4e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6b67df3f24c45af0012ee3c8af2f62ca083ae18
+refs/heads/master: b52398b6e4522176dd125722c72c301015d24520
diff --git a/trunk/drivers/net/wireless/rt2x00/rt2800lib.c b/trunk/drivers/net/wireless/rt2x00/rt2800lib.c
index 75d2c6cc93eb..f94d669ed832 100644
--- a/trunk/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/trunk/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.