summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRajkumar Manoharan <rmanoharan@atheros.com>2011-02-01 23:05:36 +0530
committerJohn W. Linville <linville@tuxdriver.com>2011-02-03 16:45:29 -0500
commit391bd1c443f70447616ce0e152f13daee5ca448f (patch)
tree2a4114826cac77d52988cf088995bfadf79a3596
parente9d7732eafe38a717212648b7615399e68abb551 (diff)
downloadkernel-common-391bd1c443f70447616ce0e152f13daee5ca448f.tar.gz
kernel-common-391bd1c443f70447616ce0e152f13daee5ca448f.tar.bz2
kernel-common-391bd1c443f70447616ce0e152f13daee5ca448f.zip
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>
-rw-r--r--drivers/net/wireless/ath/ath9k/main.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index c9925e943bc0..e5c695d73025 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);
}
}