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

Commit 845d708e authored by Senthil Balasubramanian's avatar Senthil Balasubramanian Committed by John W. Linville
Browse files

ath9k: Introduce a wrapper for power save disable. 



Signed-off-by: default avatarSenthil Balasubramanian <senthilkumar@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent fbab7390

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

+22 −18
Original line number Diff line number Diff line
@@ -1498,13 +1498,32 @@ static void ath9k_enable_ps(struct ath_softc *sc) 
	}

}



static void ath9k_disable_ps(struct ath_softc *sc)

{

	struct ath_hw *ah = sc->sc_ah;



	sc->ps_enabled = false;

	ath9k_hw_setpower(ah, ATH9K_PM_AWAKE);

	if (!(ah->caps.hw_caps & ATH9K_HW_CAP_AUTOSLEEP)) {

		ath9k_hw_setrxabort(ah, 0);

		sc->ps_flags &= ~(PS_WAIT_FOR_BEACON |

				  PS_WAIT_FOR_CAB |

				  PS_WAIT_FOR_PSPOLL_DATA |

				  PS_WAIT_FOR_TX_ACK);

		if (ah->imask & ATH9K_INT_TIM_TIMER) {

			ah->imask &= ~ATH9K_INT_TIM_TIMER;

			ath9k_hw_set_interrupts(ah, ah->imask);

		}

	}



}



static int ath9k_config(struct ieee80211_hw *hw, u32 changed)

{

	struct ath_wiphy *aphy = hw->priv;

	struct ath_softc *sc = aphy->sc;

	struct ath_common *common = ath9k_hw_common(sc->sc_ah);

	struct ieee80211_conf *conf = &hw->conf;

	struct ath_hw *ah = sc->sc_ah;

	bool disable_radio;



	mutex_lock(&sc->mutex);
@@ -1553,23 +1572,8 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed) 
		spin_lock_irqsave(&sc->sc_pm_lock, flags);

		if (conf->flags & IEEE80211_CONF_PS)

			ath9k_enable_ps(sc);

		else {

			sc->ps_enabled = false;

			ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_AWAKE);

			if (!(ah->caps.hw_caps &

			      ATH9K_HW_CAP_AUTOSLEEP)) {

				ath9k_hw_setrxabort(sc->sc_ah, 0);

				sc->ps_flags &= ~(PS_WAIT_FOR_BEACON |

						  PS_WAIT_FOR_CAB |

						  PS_WAIT_FOR_PSPOLL_DATA |

						  PS_WAIT_FOR_TX_ACK);

				if (ah->imask & ATH9K_INT_TIM_TIMER) {

					ah->imask &= ~ATH9K_INT_TIM_TIMER;

					ath9k_hw_set_interrupts(sc->sc_ah,

							ah->imask);

				}

			}

		}

		else

			ath9k_disable_ps(sc);

		spin_unlock_irqrestore(&sc->sc_pm_lock, flags);

	}