projects
/
openwrt
/
staging
/
lynxis
/
omap.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ae329c4
)
mac80211: fix a few more minstrel_ht bugs (thx to Christian Lamparter)
author
Felix Fietkau
<nbd@openwrt.org>
Sun, 7 Mar 2010 18:35:39 +0000
(18:35 +0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Sun, 7 Mar 2010 18:35:39 +0000
(18:35 +0000)
SVN-Revision: 20040
package/mac80211/patches/560-minstrel_ht.patch
patch
|
blob
|
history
diff --git
a/package/mac80211/patches/560-minstrel_ht.patch
b/package/mac80211/patches/560-minstrel_ht.patch
index 9fa9e05c526fcb70fa886e6f7ba41baf3d97b115..1cb433db12949ebbb2416b09228cbc6ab6cd1df9 100644
(file)
--- a/
package/mac80211/patches/560-minstrel_ht.patch
+++ b/
package/mac80211/patches/560-minstrel_ht.patch
@@
-68,7
+68,7
@@
--- /dev/null
+++ b/net/mac80211/rc80211_minstrel_ht.c
--- /dev/null
+++ b/net/mac80211/rc80211_minstrel_ht.c
-@@ -0,0 +1,80
7
@@
+@@ -0,0 +1,80
9
@@
+/*
+ * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
+ *
+/*
+ * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
+ *
@@
-479,13
+479,15
@@
+ * downgrade to a lower number of streams if necessary.
+ */
+ rate = minstrel_get_ratestats(mi, mi->max_tp_rate);
+ * downgrade to a lower number of streams if necessary.
+ */
+ rate = minstrel_get_ratestats(mi, mi->max_tp_rate);
-+ if (MINSTREL_FRAC(rate->success, rate->attempts) <
-+ MINSTREL_FRAC(20, 100) && rate->attempts > 30)
++ if (rate->attempts > 30 &&
++ MINSTREL_FRAC(rate->success, rate->attempts) <
++ MINSTREL_FRAC(20, 100))
+ minstrel_downgrade_rate(mi, &mi->max_tp_rate, true);
+
+ rate2 = minstrel_get_ratestats(mi, mi->max_tp_rate2);
+ minstrel_downgrade_rate(mi, &mi->max_tp_rate, true);
+
+ rate2 = minstrel_get_ratestats(mi, mi->max_tp_rate2);
-+ if (MINSTREL_FRAC(rate->success, rate->attempts) <
-+ MINSTREL_FRAC(20, 100) && rate->attempts > 30)
++ if (rate->attempts > 30 &&
++ MINSTREL_FRAC(rate->success, rate->attempts) <
++ MINSTREL_FRAC(20, 100))
+ minstrel_downgrade_rate(mi, &mi->max_tp_rate2, false);
+
+ if (time_after(jiffies, mi->stats_update + (mp->update_interval / 2 * HZ) / 1000))
+ minstrel_downgrade_rate(mi, &mi->max_tp_rate2, false);
+
+ if (time_after(jiffies, mi->stats_update + (mp->update_interval / 2 * HZ) / 1000))
@@
-1062,7
+1064,7
@@
+ struct minstrel_rate_stats *mr = &mi->groups[i].rates[j];
+ int idx = i * MCS_GROUP_RATES + j;
+
+ struct minstrel_rate_stats *mr = &mi->groups[i].rates[j];
+ int idx = i * MCS_GROUP_RATES + j;
+
-+ if (!
mi->groups[i].supported & BIT(j
))
++ if (!
(mi->groups[i].supported & BIT(j)
))
+ continue;
+
+ p += sprintf(p, "HT%c0/%cGI ", htmode, gimode);
+ continue;
+
+ p += sprintf(p, "HT%c0/%cGI ", htmode, gimode);