Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37feb7e2 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Johannes Berg
Browse files

mac80211: do not override fixed_rate_idx in minstrel_ht_update_stats 



Do not override max_tp_rate, max_tp_rate2 and max_prob_rate configured
according to fixed_rate in minstrel_ht_update_stats throughput computation

Signed-off-by: default avatarLorenzo Bianconi <lorenzo.bianconi83@gmail.com>
Acked-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 45966aeb

net/mac80211/rc80211_minstrel_ht.c

+13 −10
Original line number Diff line number Diff line
@@ -365,6 +365,14 @@ minstrel_ht_update_stats(struct minstrel_priv *mp, struct minstrel_ht_sta *mi) 
		}

	}



#ifdef CONFIG_MAC80211_DEBUGFS

	/* use fixed index if set */

	if (mp->fixed_rate_idx != -1) {

		mi->max_tp_rate = mp->fixed_rate_idx;

		mi->max_tp_rate2 = mp->fixed_rate_idx;

		mi->max_prob_rate = mp->fixed_rate_idx;

	}

#endif



	mi->stats_update = jiffies;

}
@@ -774,6 +782,11 @@ minstrel_ht_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta, 
	info->flags |= mi->tx_flags;

	minstrel_ht_check_cck_shortpreamble(mp, mi, txrc->short_preamble);



#ifdef CONFIG_MAC80211_DEBUGFS

	if (mp->fixed_rate_idx != -1)

		return;

#endif



	/* Don't use EAPOL frames for sampling on non-mrr hw */

	if (mp->hw->max_rates == 1 &&

	    (info->control.flags & IEEE80211_TX_CTRL_PORT_CTRL_PROTO))
@@ -781,16 +794,6 @@ minstrel_ht_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta, 
	else

		sample_idx = minstrel_get_sample_rate(mp, mi);



#ifdef CONFIG_MAC80211_DEBUGFS

	/* use fixed index if set */

	if (mp->fixed_rate_idx != -1) {

		mi->max_tp_rate = mp->fixed_rate_idx;

		mi->max_tp_rate2 = mp->fixed_rate_idx;

		mi->max_prob_rate = mp->fixed_rate_idx;

		sample_idx = -1;

	}

#endif



	mi->total_packets++;



	/* wraparound */