ath9k: Use configurable timeout for flush

The timeout value for flushing the TX queues
is hardcoded at 200ms right now. Use a channel
context-specific value instead to allow adjustments
to the timeout in case MCC is enabled.

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 bc90fabdd9213b02ee426f83f60d486b0679a04d..43c1987978a8a72a46800f237705ae6b79f6cab1 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -345,6 +345,7 @@ struct ath_chanctx {
        u64 tsf_val;
        u32 last_beacon;
 
+       int flush_timeout;
        u16 txpower;
        bool offchannel;
        bool stopped;

diff --git a/drivers/net/wireless/ath/ath9k/channel.c b/drivers/net/wireless/ath/ath9k/channel.c
index 74a5c27ba63f8042f3924647507ad1f2953f4fd2..5045b107b6d8b1b36dbfb286c974094b44139ed7 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/channel.c
+++ b/drivers/net/wireless/ath/ath9k/channel.c
@@ -117,6 +117,7 @@ void ath_chanctx_init(struct ath_softc *sc)
                cfg80211_chandef_create(&ctx->chandef, chan, NL80211_CHAN_HT20);
                INIT_LIST_HEAD(&ctx->vifs);
                ctx->txpower = ATH_TXPOWER_MAX;
+               ctx->flush_timeout = HZ / 5; /* 200ms */
                for (j = 0; j < ARRAY_SIZE(ctx->acq); j++)
                        INIT_LIST_HEAD(&ctx->acq[j]);
        }

diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 5d54f39a61a80814d8a84e3f77ac6386dbc8b65f..81a20de771c5173ef2ded3e562ac7f09049602f0 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -2034,7 +2034,7 @@ void __ath9k_flush(struct ieee80211_hw *hw, u32 queues, bool drop)
        struct ath_softc *sc = hw->priv;
        struct ath_hw *ah = sc->sc_ah;
        struct ath_common *common = ath9k_hw_common(ah);
-       int timeout = HZ / 5; /* 200 ms */
+       int timeout;
        bool drain_txq;
 
        cancel_delayed_work_sync(&sc->tx_complete_work);
@@ -2049,6 +2049,13 @@ void __ath9k_flush(struct ieee80211_hw *hw, u32 queues, bool drop)
                return;
        }
 
+       spin_lock_bh(&sc->chan_lock);
+       timeout = sc->cur_chan->flush_timeout;
+       spin_unlock_bh(&sc->chan_lock);
+
+       ath_dbg(common, CHAN_CTX,
+               "Flush timeout: %d\n", jiffies_to_msecs(timeout));
+
        if (wait_event_timeout(sc->tx_wait, !ath9k_has_tx_pending(sc),
                               timeout) > 0)
                drop = false;