Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73900cb0 authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

ath9k: Use bitops for scan flag 



Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent cf657a2b

drivers/net/wireless/ath/ath9k/ath9k.h

+1 −1
Original line number Diff line number Diff line
@@ -646,6 +646,7 @@ enum sc_op_flags { 
	SC_OP_ANI_RUN,

	SC_OP_PRIM_STA_VIF,

	SC_OP_HW_RESET,

	SC_OP_SCANNING,

};



/* Powersave flags */
@@ -759,7 +760,6 @@ struct ath_softc { 
	struct rchan *rfs_chan_spec_scan;

	enum spectral_mode spectral_mode;

	struct ath_spec_scan spec_config;

	int scanning;



#ifdef CONFIG_PM_SLEEP

	atomic_t wow_got_bmiss_intr;

drivers/net/wireless/ath/ath9k/main.c

+3 −5
Original line number Diff line number Diff line
@@ -1272,7 +1272,7 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed) 
				curchan->center_freq);

		} else {

			/* perform spectral scan if requested. */

			if (sc->scanning &&

			if (test_bit(SC_OP_SCANNING, &sc->sc_flags) &&

			    sc->spectral_mode == SPECTRAL_CHANSCAN)

				ath9k_spectral_scan_trigger(hw);

		}
@@ -2334,15 +2334,13 @@ static void ath9k_set_wakeup(struct ieee80211_hw *hw, bool enabled) 
static void ath9k_sw_scan_start(struct ieee80211_hw *hw)

{

	struct ath_softc *sc = hw->priv;



	sc->scanning = 1;

	set_bit(SC_OP_SCANNING, &sc->sc_flags);

}



static void ath9k_sw_scan_complete(struct ieee80211_hw *hw)

{

	struct ath_softc *sc = hw->priv;



	sc->scanning = 0;

	clear_bit(SC_OP_SCANNING, &sc->sc_flags);

}



struct ieee80211_ops ath9k_ops = {