]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
mac80211: use capped prob when computing throughputs
authorKarl Beldan <karl.beldan@rivierawaves.com>
Wed, 20 Nov 2013 18:13:35 +0000 (19:13 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 25 Nov 2013 15:56:17 +0000 (16:56 +0100)
Commit 3e8b1eb "mac80211/minstrel_ht: improve rate selection stability"
introduced a local capped prob in minstrel_ht_calc_tp but omitted to use
it to compute the per rate throughput.

Signed-off-by: Karl Beldan <karl.beldan@rivierawaves.com>
Cc: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/rc80211_minstrel_ht.c

index 47aa6f81566b32fb9bf63d274b0bef4edf446d49..4096ff6cc24fe8a5c3505411c5b232e0d800e050 100644 (file)
@@ -226,7 +226,7 @@ minstrel_ht_calc_tp(struct minstrel_ht_sta *mi, int group, int rate)
                nsecs = 1000 * mi->overhead / MINSTREL_TRUNC(mi->avg_ampdu_len);
 
        nsecs += minstrel_mcs_groups[group].duration[rate];
-       tp = 1000000 * ((mr->probability * 1000) / nsecs);
+       tp = 1000000 * ((prob * 1000) / nsecs);
 
        mr->cur_tp = MINSTREL_TRUNC(tp);
 }