aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/main.c')
-rw-r--r--drivers/net/wireless/ath/ath9k/main.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 6cf0410ae0ba..0429dda0961f 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -1994,11 +1994,12 @@ static void ath9k_sw_scan_start(struct ieee80211_hw *hw)
1994 1994
1995 mutex_lock(&sc->mutex); 1995 mutex_lock(&sc->mutex);
1996 if (ath9k_wiphy_scanning(sc)) { 1996 if (ath9k_wiphy_scanning(sc)) {
1997 printk(KERN_DEBUG "ath9k: Two wiphys trying to scan at the "
1998 "same time\n");
1999 /* 1997 /*
2000 * Do not allow the concurrent scanning state for now. This 1998 * There is a race here in mac80211 but fixing it requires
2001 * could be improved with scanning control moved into ath9k. 1999 * we revisit how we handle the scan complete callback.
2000 * After mac80211 fixes we will not have configured hardware
2001 * to the home channel nor would we have configured the RX
2002 * filter yet.
2002 */ 2003 */
2003 mutex_unlock(&sc->mutex); 2004 mutex_unlock(&sc->mutex);
2004 return; 2005 return;
@@ -2014,6 +2015,10 @@ static void ath9k_sw_scan_start(struct ieee80211_hw *hw)
2014 mutex_unlock(&sc->mutex); 2015 mutex_unlock(&sc->mutex);
2015} 2016}
2016 2017
2018/*
2019 * XXX: this requires a revisit after the driver
2020 * scan_complete gets moved to another place/removed in mac80211.
2021 */
2017static void ath9k_sw_scan_complete(struct ieee80211_hw *hw) 2022static void ath9k_sw_scan_complete(struct ieee80211_hw *hw)
2018{ 2023{
2019 struct ath_wiphy *aphy = hw->priv; 2024 struct ath_wiphy *aphy = hw->priv;