[openwrt/openwrt] mac80211: minstrel_ht: fix regression in the max_prob_rate fix

LEDE Commits lede-commits at lists.infradead.org
Tue Jan 26 10:46:59 EST 2021


nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/56c20f0a5ab037ba7dee71ce3d7e05197b2cccf7

commit 56c20f0a5ab037ba7dee71ce3d7e05197b2cccf7
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Tue Jan 26 16:46:19 2021 +0100

    mac80211: minstrel_ht: fix regression in the max_prob_rate fix
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 ...nstrel_ht-fix-regression-in-the-max_prob_.patch | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/package/kernel/mac80211/patches/subsys/352-mac80211-minstrel_ht-fix-regression-in-the-max_prob_.patch b/package/kernel/mac80211/patches/subsys/352-mac80211-minstrel_ht-fix-regression-in-the-max_prob_.patch
new file mode 100644
index 0000000000..a366a921d4
--- /dev/null
+++ b/package/kernel/mac80211/patches/subsys/352-mac80211-minstrel_ht-fix-regression-in-the-max_prob_.patch
@@ -0,0 +1,23 @@
+From: Felix Fietkau <nbd at nbd.name>
+Date: Tue, 26 Jan 2021 16:40:52 +0100
+Subject: [PATCH] mac80211: minstrel_ht: fix regression in the max_prob_rate
+ fix
+
+Since mi->max_prob_rate is overwritten after the loop that calls
+minstrel_ht_set_best_prob_rate, the new best rate needs to be written to *dest
+
+Fixes: a7fca4e4037f ("mac80211: minstrel_ht: fix max probability rate selection")
+Signed-off-by: Felix Fietkau <nbd at nbd.name>
+---
+
+--- a/net/mac80211/rc80211_minstrel_ht.c
++++ b/net/mac80211/rc80211_minstrel_ht.c
+@@ -545,7 +545,7 @@ minstrel_ht_set_best_prob_rate(struct mi
+ 		cur_tp_avg = minstrel_ht_get_tp_avg(mi, cur_group, cur_idx,
+ 						    mrs->prob_avg);
+ 		if (cur_tp_avg > tmp_tp_avg)
+-			mi->max_prob_rate = index;
++			*dest = index;
+ 
+ 		max_gpr_tp_avg = minstrel_ht_get_tp_avg(mi, max_gpr_group,
+ 							max_gpr_idx,



More information about the lede-commits mailing list