mac80211: update to wireless-testing 2010-11-10 + some pending work

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

1 files changed, 0 insertions, 52 deletions

diff --git a/package/mac80211/patches/562-minstrel_sample_performance.patch b/package/mac80211/patches/562-minstrel_sample_performance.patch
deleted file mode 100644
index 424a741609..0000000000
--- a/package/mac80211/patches/562-minstrel_sample_performance.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/net/mac80211/rc80211_minstrel_ht.c
-+++ b/net/mac80211/rc80211_minstrel_ht.c
-@@ -407,8 +407,8 @@ minstrel_ht_tx_status(void *priv, struct
- 	mi->ampdu_len += info->status.ampdu_len;
- 
- 	if (!mi->sample_wait && !mi->sample_tries && mi->sample_count > 0) {
--		mi->sample_wait = 4 + 2 * MINSTREL_TRUNC(mi->avg_ampdu_len);
--		mi->sample_tries = 3;
-+		mi->sample_wait = 16 + 2 * MINSTREL_TRUNC(mi->avg_ampdu_len);
-+		mi->sample_tries = 2;
- 		mi->sample_count--;
- 	}
- 
-@@ -564,7 +564,7 @@ minstrel_get_sample_rate(struct minstrel
- 	 */
- 	if (minstrel_get_duration(sample_idx) >
- 	    minstrel_get_duration(mi->max_tp_rate)) {
--		if (mr->sample_skipped < 10)
-+		if (mr->sample_skipped < 20)
- 			goto next;
- 
- 		if (mi->sample_slow++ > 2)
-@@ -588,6 +588,7 @@ minstrel_ht_get_rate(void *priv, struct 
- 	struct minstrel_ht_sta *mi = &msp->ht;
- 	struct minstrel_priv *mp = priv;
- 	int sample_idx;
-+	bool sample = false;
- 
- 	if (rate_control_send_low(sta, priv_sta, txrc))
- 		return;
-@@ -598,10 +599,11 @@ minstrel_ht_get_rate(void *priv, struct 
- 	info->flags |= mi->tx_flags;
- 	sample_idx = minstrel_get_sample_rate(mp, mi);
- 	if (sample_idx >= 0) {
-+		sample = true;
- 		minstrel_ht_set_rate(mp, mi, &ar[0], sample_idx,
- 			txrc, true, false);
- 		minstrel_ht_set_rate(mp, mi, &ar[1], mi->max_tp_rate,
--			txrc, false, true);
-+			txrc, false, false);
- 		info->flags |= IEEE80211_TX_CTL_RATE_CTRL_PROBE;
- 	} else {
- 		minstrel_ht_set_rate(mp, mi, &ar[0], mi->max_tp_rate,
-@@ -609,7 +611,7 @@ minstrel_ht_get_rate(void *priv, struct 
- 		minstrel_ht_set_rate(mp, mi, &ar[1], mi->max_tp_rate2,
- 			txrc, false, true);
- 	}
--	minstrel_ht_set_rate(mp, mi, &ar[2], mi->max_prob_rate, txrc, false, true);
-+	minstrel_ht_set_rate(mp, mi, &ar[2], mi->max_prob_rate, txrc, false, !sample);
- 
- 	ar[3].count = 0;
- 	ar[3].idx = -1;