ath9k: Implement mgd_prepare_tx

Signed-off-by: Rajkumar Manoharan <rmanohar@qti.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 a4646a0760999a92d93fa70bede59f7dad6d1b75..7947909918bd212b571848fbf777120aded7ac40 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -357,6 +357,7 @@ enum ath_chanctx_state {
        ATH_CHANCTX_STATE_WAIT_FOR_BEACON,
        ATH_CHANCTX_STATE_WAIT_FOR_TIMER,
        ATH_CHANCTX_STATE_SWITCH,
+       ATH_CHANCTX_STATE_FORCE_ACTIVE,
 };
 
 struct ath_chanctx_sched {
@@ -397,6 +398,8 @@ struct ath_offchannel {
             ctx++)
 
 void ath9k_fill_chanctx_ops(void);
+void ath9k_chanctx_force_active(struct ieee80211_hw *hw,
+                               struct ieee80211_vif *vif);
 static inline struct ath_chanctx *
 ath_chanctx_get(struct ieee80211_chanctx_conf *ctx)
 {

diff --git a/drivers/net/wireless/ath/ath9k/channel.c b/drivers/net/wireless/ath/ath9k/channel.c
index 6ea806cc68fe8624556f308a8202eba3a7df5adc..8d56b7961d7bdb874e65797166c03457a338be0b 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/channel.c
+++ b/drivers/net/wireless/ath/ath9k/channel.c
@@ -223,25 +223,20 @@ static bool ath_chanctx_defer_switch(struct ath_softc *sc)
        return true;
 }
 
-void ath_chanctx_work(struct work_struct *work)
+static void ath_chanctx_set_next(struct ath_softc *sc, bool force)
 {
-       struct ath_softc *sc = container_of(work, struct ath_softc,
-                                           chanctx_work);
        struct timespec ts;
        bool measure_time = false;
        bool send_ps = false;
 
-       mutex_lock(&sc->mutex);
        spin_lock_bh(&sc->chan_lock);
        if (!sc->next_chan) {
                spin_unlock_bh(&sc->chan_lock);
-               mutex_unlock(&sc->mutex);
                return;
        }
 
-       if (ath_chanctx_defer_switch(sc)) {
+       if (!force && ath_chanctx_defer_switch(sc)) {
                spin_unlock_bh(&sc->chan_lock);
-               mutex_unlock(&sc->mutex);
                return;
        }
 
@@ -269,8 +264,9 @@ void ath_chanctx_work(struct work_struct *work)
        sc->cur_chan = sc->next_chan;
        sc->cur_chan->stopped = false;
        sc->next_chan = NULL;
-       sc->sched.state = ATH_CHANCTX_STATE_IDLE;
        sc->sched.offchannel_duration = 0;
+       if (sc->sched.state != ATH_CHANCTX_STATE_FORCE_ACTIVE)
+               sc->sched.state = ATH_CHANCTX_STATE_IDLE;
 
        spin_unlock_bh(&sc->chan_lock);
 
@@ -286,6 +282,14 @@ void ath_chanctx_work(struct work_struct *work)
                ath_chanctx_send_ps_frame(sc, false);
 
        ath_offchannel_channel_change(sc);
+}
+
+void ath_chanctx_work(struct work_struct *work)
+{
+       struct ath_softc *sc = container_of(work, struct ath_softc,
+                                           chanctx_work);
+       mutex_lock(&sc->mutex);
+       ath_chanctx_set_next(sc, false);
        mutex_unlock(&sc->mutex);
 }
 
@@ -320,6 +324,36 @@ 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)
 {

diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 0ba496d400d07e4e950cbce12af0c1d946e09113..b8975f0700bfa5286b479735a7d426c6bdcbb529 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -2553,6 +2553,7 @@ void ath9k_fill_chanctx_ops(void)
        ath9k_ops.change_chanctx     = ath9k_change_chanctx;
        ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
        ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
+       ath9k_ops.mgd_prepare_tx = ath9k_chanctx_force_active;
 }
 
 struct ieee80211_ops ath9k_ops = {