From e27a1648d193e8cf6adf94ff2e1629cdc13cc43b Mon Sep 17 00:00:00 2001
From: Helmut Schaa <helmut.schaa@googlemail.com>
Date: Mon, 18 Apr 2011 15:28:50 +0200
Subject: [PATCH] --- yaml --- r: 246959 b: refs/heads/master c:
 8da3efbb4a18be30ed03dd05af18d0b026b15173 h: refs/heads/master i:   246957:
 71e9b44a0f447edaf29282900b15ef902a1619d1   246955:
 ce5d2e44b55a7c40279ec40244de7b59789b691b   246951:
 17826d90b6e806e8291fa76579f562529960cba2   246943:
 59af2c4e8454ac6c722eb78731e62cd978f6d763 v: v3

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

diff --git a/[refs] b/[refs]
index 808f5c40f7d8..bf960d5bb68b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 961636ba17fa45b27ee4674430e1e775b8966b0e
+refs/heads/master: 8da3efbb4a18be30ed03dd05af18d0b026b15173
diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00ht.c b/trunk/drivers/net/wireless/rt2x00/rt2x00ht.c
index e8c0c3e92c2f..a30f68c7fd7e 100644
--- a/trunk/drivers/net/wireless/rt2x00/rt2x00ht.c
+++ b/trunk/drivers/net/wireless/rt2x00/rt2x00ht.c
@@ -92,14 +92,15 @@ void rt2x00ht_create_tx_descriptor(struct queue_entry *entry,
 
 	/*
 	 * Determine IFS values
-	 * - Use TXOP_BACKOFF for management frames
+	 * - Use TXOP_BACKOFF for management frames except beacons
 	 * - Use TXOP_SIFS for fragment bursts
 	 * - Use TXOP_HTTXOP for everything else
 	 *
 	 * Note: rt2800 devices won't use CTS protection (if used)
 	 * for frames not transmitted with TXOP_HTTXOP
 	 */
-	if (ieee80211_is_mgmt(hdr->frame_control))
+	if (ieee80211_is_mgmt(hdr->frame_control) &&
+	    !ieee80211_is_beacon(hdr->frame_control))
 		txdesc->u.ht.txop = TXOP_BACKOFF;
 	else if (!(tx_info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT))
 		txdesc->u.ht.txop = TXOP_SIFS;