aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k/main.c
diff options
context:
space:
mode:
authorSujith Manoharan <c_manoha@qca.qualcomm.com>2013-05-07 19:33:31 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-05-22 15:05:32 -0400
commit73900cb068a2948d636feae0c8bc25cc2d568d6d (patch)
treeb7e4d9d063fc2c30eaf4813e12ef28964b7aa9ee /drivers/net/wireless/ath/ath9k/main.c
parentcf657a2bc50dff0191d55fff4e7b31e7a6a542a5 (diff)
ath9k: Use bitops for scan flag
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/main.c')
-rw-r--r--drivers/net/wireless/ath/ath9k/main.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 1cbfdd4e4a74..ec6524aa5178 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -1272,7 +1272,7 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
1272 curchan->center_freq); 1272 curchan->center_freq);
1273 } else { 1273 } else {
1274 /* perform spectral scan if requested. */ 1274 /* perform spectral scan if requested. */
1275 if (sc->scanning && 1275 if (test_bit(SC_OP_SCANNING, &sc->sc_flags) &&
1276 sc->spectral_mode == SPECTRAL_CHANSCAN) 1276 sc->spectral_mode == SPECTRAL_CHANSCAN)
1277 ath9k_spectral_scan_trigger(hw); 1277 ath9k_spectral_scan_trigger(hw);
1278 } 1278 }
@@ -2334,15 +2334,13 @@ static void ath9k_set_wakeup(struct ieee80211_hw *hw, bool enabled)
2334static void ath9k_sw_scan_start(struct ieee80211_hw *hw) 2334static void ath9k_sw_scan_start(struct ieee80211_hw *hw)
2335{ 2335{
2336 struct ath_softc *sc = hw->priv; 2336 struct ath_softc *sc = hw->priv;
2337 2337 set_bit(SC_OP_SCANNING, &sc->sc_flags);
2338 sc->scanning = 1;
2339} 2338}
2340 2339
2341static void ath9k_sw_scan_complete(struct ieee80211_hw *hw) 2340static void ath9k_sw_scan_complete(struct ieee80211_hw *hw)
2342{ 2341{
2343 struct ath_softc *sc = hw->priv; 2342 struct ath_softc *sc = hw->priv;
2344 2343 clear_bit(SC_OP_SCANNING, &sc->sc_flags);
2345 sc->scanning = 0;
2346} 2344}
2347 2345
2348struct ieee80211_ops ath9k_ops = { 2346struct ieee80211_ops ath9k_ops = {