From: Rajkumar Manoharan <rmanoharan@atheros.com>
Date: Tue, 1 Feb 2011 17:35:36 +0000 (+0530)
Subject: ath9k: reserve a beacon slot on beaconing vif addition
X-Git-Tag: v2.6.39-rc1~468^2~403^2~38
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=391bd1c443f70447616ce0e152f13daee5ca448f;p=~shefty%2Frdma-dev.git

ath9k: reserve a beacon slot on beaconing vif addition

The beaconing vif addition is based on max beacon slot
available. So it is better to reserve a beacon slot
on interface addition and let it be configured properly
on bss_info change.

Signed-off-by: Rajkumar Manoharan <rmanoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index c9925e943bc..e5c695d7302 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -1419,9 +1419,7 @@ static void ath9k_do_vif_add_setup(struct ieee80211_hw *hw,
 		 * there.
 		 */
 		error = ath_beacon_alloc(sc, vif);
-		if (error)
-			ath9k_reclaim_beacon(sc, vif);
-		else
+		if (!error)
 			ath_beacon_config(sc, vif);
 	}
 }