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: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 37a5ccf64dffe8a56f34895bb07a667d26159c4c..4f94d3190867c4c33426a14d24e8d776358042af 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -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,
                          struct sk_buff *skb);
 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_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
 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,

diff --git a/drivers/net/wireless/ath/ath9k/channel.c b/drivers/net/wireless/ath/ath9k/channel.c
index d088f06df2e049c7e698da8a7ad635083ff7bc40..96da03e5f534a976fbe989cfb0e6a1e776f6d444 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/channel.c
+++ b/drivers/net/wireless/ath/ath9k/channel.c
@@ -1177,18 +1177,18 @@ bool ath9k_is_chanctx_enabled(void)
 /* 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;
        int i;
 
-       if (sc->cur_chan == &sc->offchannel.chan) {
+       if (ctx == &sc->offchannel.chan) {
                ieee80211_wake_queue(sc->hw,
                                     sc->hw->offchannel_tx_hw_queue);
        } else {
                for (i = 0; i < IEEE80211_NUM_ACS; i++)
                        ieee80211_wake_queue(sc->hw,
-                                            sc->cur_chan->hw_queue_base + i);
+                                            ctx->hw_queue_base + i);
        }
 
        if (ah->opmode == NL80211_IFTYPE_AP)

diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index b4c2642c764c2b3d0b2b554923621304f8aa0f93..19bbc91325c26b9d1833ffdfe94ff1e1b8507bbb 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -268,7 +268,7 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start)
        if (!ath9k_is_chanctx_enabled())
                ieee80211_wake_queues(sc->hw);
        else
-               ath9k_chanctx_wake_queues(sc);
+               ath9k_chanctx_wake_queues(sc, sc->cur_chan);
 
        ath9k_p2p_ps_timer(sc);