Commit b3903153 authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville

ath9k: Pass context to ath9k_chanctx_wake_queues()

Change the ath9k_chanctx_wake_queues() API so
that we can pass the channel context that needs its
queues to be stopped.
Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4f82eecf
...@@ -455,7 +455,7 @@ void ath9k_p2p_bss_info_changed(struct ath_softc *sc, ...@@ -455,7 +455,7 @@ void ath9k_p2p_bss_info_changed(struct ath_softc *sc,
void ath9k_beacon_add_noa(struct ath_softc *sc, struct ath_vif *avp, void ath9k_beacon_add_noa(struct ath_softc *sc, struct ath_vif *avp,
struct sk_buff *skb); struct sk_buff *skb);
void ath9k_p2p_ps_timer(void *priv); void ath9k_p2p_ps_timer(void *priv);
void ath9k_chanctx_wake_queues(struct ath_softc *sc); void ath9k_chanctx_wake_queues(struct ath_softc *sc, struct ath_chanctx *ctx);
void ath_chanctx_check_active(struct ath_softc *sc, struct ath_chanctx *ctx); void ath_chanctx_check_active(struct ath_softc *sc, struct ath_chanctx *ctx);
void ath_chanctx_beacon_recv_ev(struct ath_softc *sc, void ath_chanctx_beacon_recv_ev(struct ath_softc *sc,
...@@ -525,7 +525,8 @@ static inline void ath9k_beacon_add_noa(struct ath_softc *sc, struct ath_vif *av ...@@ -525,7 +525,8 @@ static inline void ath9k_beacon_add_noa(struct ath_softc *sc, struct ath_vif *av
static inline void ath9k_p2p_ps_timer(struct ath_softc *sc) static inline void ath9k_p2p_ps_timer(struct ath_softc *sc)
{ {
} }
static inline void ath9k_chanctx_wake_queues(struct ath_softc *sc) static inline void ath9k_chanctx_wake_queues(struct ath_softc *sc,
struct ath_chanctx *ctx)
{ {
} }
static inline void ath_chanctx_check_active(struct ath_softc *sc, static inline void ath_chanctx_check_active(struct ath_softc *sc,
......
...@@ -1177,18 +1177,18 @@ bool ath9k_is_chanctx_enabled(void) ...@@ -1177,18 +1177,18 @@ bool ath9k_is_chanctx_enabled(void)
/* Queue management */ /* Queue management */
/********************/ /********************/
void ath9k_chanctx_wake_queues(struct ath_softc *sc) void ath9k_chanctx_wake_queues(struct ath_softc *sc, struct ath_chanctx *ctx)
{ {
struct ath_hw *ah = sc->sc_ah; struct ath_hw *ah = sc->sc_ah;
int i; int i;
if (sc->cur_chan == &sc->offchannel.chan) { if (ctx == &sc->offchannel.chan) {
ieee80211_wake_queue(sc->hw, ieee80211_wake_queue(sc->hw,
sc->hw->offchannel_tx_hw_queue); sc->hw->offchannel_tx_hw_queue);
} else { } else {
for (i = 0; i < IEEE80211_NUM_ACS; i++) for (i = 0; i < IEEE80211_NUM_ACS; i++)
ieee80211_wake_queue(sc->hw, ieee80211_wake_queue(sc->hw,
sc->cur_chan->hw_queue_base + i); ctx->hw_queue_base + i);
} }
if (ah->opmode == NL80211_IFTYPE_AP) if (ah->opmode == NL80211_IFTYPE_AP)
......
...@@ -268,7 +268,7 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start) ...@@ -268,7 +268,7 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start)
if (!ath9k_is_chanctx_enabled()) if (!ath9k_is_chanctx_enabled())
ieee80211_wake_queues(sc->hw); ieee80211_wake_queues(sc->hw);
else else
ath9k_chanctx_wake_queues(sc); ath9k_chanctx_wake_queues(sc, sc->cur_chan);
ath9k_p2p_ps_timer(sc); ath9k_p2p_ps_timer(sc);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment