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

Commit 4e30ffa2 authored by Vivek Natarajan's avatar Vivek Natarajan Committed by John W. Linville
Browse files

ath9k: Enable MIB and TIM interrupts for station mode. 



Enable operating mode specific interrupts in ath9k_add_interface instead
of ath9k_start.

Signed-off-by: default avatarVivek Natarajan <vnatarajan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d22b0022

drivers/net/wireless/ath9k/main.c

+21 −19
Original line number Diff line number Diff line
@@ -1957,25 +1957,6 @@ static int ath9k_start(struct ieee80211_hw *hw) 
	if (sc->sc_ah->ah_caps.hw_caps & ATH9K_HW_CAP_HT)

		sc->sc_imask |= ATH9K_INT_CST;



	/*

	 * Enable MIB interrupts when there are hardware phy counters.

	 * Note we only do this (at the moment) for station mode.

	 */

	if (ath9k_hw_phycounters(sc->sc_ah) &&

	    ((sc->sc_ah->ah_opmode == NL80211_IFTYPE_STATION) ||

	     (sc->sc_ah->ah_opmode == NL80211_IFTYPE_ADHOC)))

		sc->sc_imask |= ATH9K_INT_MIB;

	/*

	 * Some hardware processes the TIM IE and fires an

	 * interrupt when the TIM bit is set.  For hardware

	 * that does, if not overridden by configuration,

	 * enable the TIM interrupt when operating as station.

	 */

	if ((sc->sc_ah->ah_caps.hw_caps & ATH9K_HW_CAP_ENHANCEDPM) &&

	    (sc->sc_ah->ah_opmode == NL80211_IFTYPE_STATION) &&

	    !sc->sc_config.swBeaconProcess)

		sc->sc_imask |= ATH9K_INT_TIM;



	ath_cache_conf_rate(sc, &hw->conf);



	sc->sc_flags &= ~SC_OP_INVALID;
@@ -2124,6 +2105,27 @@ static int ath9k_add_interface(struct ieee80211_hw *hw, 
	/* Set the device opmode */

	sc->sc_ah->ah_opmode = ic_opmode;



	/*

	 * Enable MIB interrupts when there are hardware phy counters.

	 * Note we only do this (at the moment) for station mode.

	 */

	if (ath9k_hw_phycounters(sc->sc_ah) &&

	    ((conf->type == NL80211_IFTYPE_STATION) ||

	     (conf->type == NL80211_IFTYPE_ADHOC)))

		sc->sc_imask |= ATH9K_INT_MIB;

	/*

	 * Some hardware processes the TIM IE and fires an

	 * interrupt when the TIM bit is set.  For hardware

	 * that does, if not overridden by configuration,

	 * enable the TIM interrupt when operating as station.

	 */

	if ((sc->sc_ah->ah_caps.hw_caps & ATH9K_HW_CAP_ENHANCEDPM) &&

	    (conf->type == NL80211_IFTYPE_STATION) &&

	    !sc->sc_config.swBeaconProcess)

		sc->sc_imask |= ATH9K_INT_TIM;



	ath9k_hw_set_interrupts(sc->sc_ah, sc->sc_imask);



	if (conf->type == NL80211_IFTYPE_AP) {

		/* TODO: is this a suitable place to start ANI for AP mode? */

		/* Start ANI */