diff options
| author | Sujith Manoharan <c_manoha@qca.qualcomm.com> | 2014-08-23 13:29:09 +0530 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-08-28 14:49:36 -0400 |
| commit | e20a854ed32d30be1356fef7bf9d4f0a29d5cf6b (patch) | |
| tree | 26af9b28f1328c26b1a212ed08bf89c9a85d5907 /drivers/net/wireless/ath/ath9k/channel.c | |
| parent | 0e62f8b706bd72095eb8ef4f60ccb007d1facf2e (diff) | |
| download | lwn-e20a854ed32d30be1356fef7bf9d4f0a29d5cf6b.tar.gz lwn-e20a854ed32d30be1356fef7bf9d4f0a29d5cf6b.zip | |
ath9k: Cleanup mgd_prepare_tx callback
Rename the callback from ath9k_chanctx_force_active()
to ath9k_mgd_prepare_tx(). Also, move it to main.c and
group it with the other callbacks.
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/channel.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/channel.c | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/drivers/net/wireless/ath/ath9k/channel.c b/drivers/net/wireless/ath/ath9k/channel.c index 0b84917dbfe3..4525fc0f657b 100644 --- a/drivers/net/wireless/ath/ath9k/channel.c +++ b/drivers/net/wireless/ath/ath9k/channel.c @@ -243,7 +243,7 @@ static bool ath_chanctx_defer_switch(struct ath_softc *sc) return true; } -static void ath_chanctx_set_next(struct ath_softc *sc, bool force) +void ath_chanctx_set_next(struct ath_softc *sc, bool force) { struct timespec ts; bool measure_time = false; @@ -336,36 +336,6 @@ void ath_chanctx_init(struct ath_softc *sc) } -void ath9k_chanctx_force_active(struct ieee80211_hw *hw, - struct ieee80211_vif *vif) -{ - struct ath_softc *sc = hw->priv; - struct ath_common *common = ath9k_hw_common(sc->sc_ah); - struct ath_vif *avp = (struct ath_vif *) vif->drv_priv; - bool changed = false; - - if (!test_bit(ATH_OP_MULTI_CHANNEL, &common->op_flags)) - return; - - if (!avp->chanctx) - return; - - mutex_lock(&sc->mutex); - - spin_lock_bh(&sc->chan_lock); - if (sc->next_chan || (sc->cur_chan != avp->chanctx)) { - sc->next_chan = avp->chanctx; - changed = true; - } - sc->sched.state = ATH_CHANCTX_STATE_FORCE_ACTIVE; - spin_unlock_bh(&sc->chan_lock); - - if (changed) - ath_chanctx_set_next(sc, true); - - mutex_unlock(&sc->mutex); -} - void ath_chanctx_switch(struct ath_softc *sc, struct ath_chanctx *ctx, struct cfg80211_chan_def *chandef) { |