From 886a2269bbe4346795453b6d6cb725316e77cfb6 Mon Sep 17 00:00:00 2001
From: Gertjan van Wingerde <gwingerde@gmail.com>
Date: Tue, 11 May 2010 23:51:38 +0200
Subject: [PATCH] --- yaml --- r: 195255 b: refs/heads/master c:
 6b97cb04f2766513c57b57f8ac4b44915296230f h: refs/heads/master i:   195253:
 53c043dcd919a17aaf780cbac182112a17aae21b   195251:
 141ad55ccff203e1558f9a8252b9a125c4077fb2   195247:
 54e52ce126da27d825eb38e29f7b3fc2590b8fc7 v: v3

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

diff --git a/[refs] b/[refs]
index 00982f0d211f..b498c7d9858b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 878f7045d8ae24f5a9e3a8a7ee5c33d30c30a553
+refs/heads/master: 6b97cb04f2766513c57b57f8ac4b44915296230f
diff --git a/trunk/drivers/net/wireless/rt2x00/rt61pci.c b/trunk/drivers/net/wireless/rt2x00/rt61pci.c
index 24363634e6fd..99c298100fb6 100644
--- a/trunk/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/trunk/drivers/net/wireless/rt2x00/rt61pci.c
@@ -1801,12 +1801,12 @@ static void rt61pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,
 	rt2x00_set_field32(&word, TXD_W5_WAITING_DMA_DONE_INT, 1);
 	rt2x00_desc_write(txd, 5, word);
 
-	rt2x00_desc_read(txd, 6, &word);
-	rt2x00_set_field32(&word, TXD_W6_BUFFER_PHYSICAL_ADDRESS,
-			   skbdesc->skb_dma);
-	rt2x00_desc_write(txd, 6, word);
+	if (txdesc->queue != QID_BEACON) {
+		rt2x00_desc_read(txd, 6, &word);
+		rt2x00_set_field32(&word, TXD_W6_BUFFER_PHYSICAL_ADDRESS,
+				   skbdesc->skb_dma);
+		rt2x00_desc_write(txd, 6, word);
 
-	if (skbdesc->desc_len > TXINFO_SIZE) {
 		rt2x00_desc_read(txd, 11, &word);
 		rt2x00_set_field32(&word, TXD_W11_BUFFER_LENGTH0,
 				   txdesc->length);