mac80211: update to wireless-testing 2014-11-04

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43210 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 0 insertions, 57 deletions

diff --git a/package/kernel/mac80211/patches/310-ath9k-Use-configurable-timeout-for-flush.patch b/package/kernel/mac80211/patches/310-ath9k-Use-configurable-timeout-for-flush.patch
deleted file mode 100644
index 3a2c41be19..0000000000
--- a/package/kernel/mac80211/patches/310-ath9k-Use-configurable-timeout-for-flush.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From: Sujith Manoharan <c_manoha@qca.qualcomm.com>
-Date: Fri, 17 Oct 2014 07:40:15 +0530
-Subject: [PATCH] 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>
----
-
---- 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;
---- 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 *
- 		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]);
- 	}
---- 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 *
- 	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 *
- 		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;