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

Commit c8ca8c2f authored by Thomas Huehn's avatar Thomas Huehn Committed by Johannes Berg
Browse files

mac80211: merge value scaling macros of minstrel_ht and minstrel 



Both minstrel versions use individual ways to scale up integer values
to perform calculations. Merge minstrel_ht's scaling macros into
minstrels header file and use them in both minstrel versions.

Acked-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarThomas Huehn <thomas@net.t-labs.tu-berlin.de>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent a512d4b5

net/mac80211/rc80211_minstrel.c

+4 −5
Original line number Diff line number Diff line
@@ -86,10 +86,8 @@ minstrel_update_stats(struct minstrel_priv *mp, struct minstrel_sta_info *mi) 
		if (!usecs)

			usecs = 1000000;



		/* To avoid rounding issues, probabilities scale from 0 (0%)

		 * to 18000 (100%) */

		if (mr->attempts) {

			mr->cur_prob = (mr->success * 18000) / mr->attempts;

			mr->cur_prob = MINSTREL_FRAC(mr->success, mr->attempts);

			mr->succ_hist += mr->success;

			mr->att_hist += mr->attempts;

			mr->probability = minstrel_ewma(mr->probability,
@@ -105,7 +103,8 @@ minstrel_update_stats(struct minstrel_priv *mp, struct minstrel_sta_info *mi) 


		/* Sample less often below the 10% chance of success.

		 * Sample less often above the 95% chance of success. */

		if ((mr->probability > 17100) || (mr->probability < 1800)) {

		if (mr->probability > MINSTREL_FRAC(95, 100) ||

		    mr->probability < MINSTREL_FRAC(10, 100)) {

			mr->adjusted_retry_count = mr->retry_count >> 1;

			if (mr->adjusted_retry_count > 2)

				mr->adjusted_retry_count = 2;
@@ -300,7 +299,7 @@ minstrel_get_rate(void *priv, struct ieee80211_sta *sta, 
	/* If we're not using MRR and the sampling rate already

	 * has a probability of >95%, we shouldn't be attempting

	 * to use it, as this only wastes precious airtime */

	if (!mrr && sample && (mi->r[ndx].probability > 17100))

	if (!mrr && sample && (mi->r[ndx].probability > MINSTREL_FRAC(95, 100)))

		ndx = mi->max_tp_rate;



	ar[0].idx = mi->r[ndx].rix;

net/mac80211/rc80211_minstrel.h

+5 −0
Original line number Diff line number Diff line
@@ -11,6 +11,11 @@ 


#define EWMA_LEVEL 75	/* ewma weighting factor [%] */



/* scaled fraction values */

#define MINSTREL_SCALE  16

#define MINSTREL_FRAC(val, div) (((val) << MINSTREL_SCALE) / div)

#define MINSTREL_TRUNC(val) ((val) >> MINSTREL_SCALE)



/*

 * Perform EWMA (Exponentially Weighted Moving Average) calculation

  */

net/mac80211/rc80211_minstrel_debugfs.c

+3 −3
Original line number Diff line number Diff line
@@ -79,9 +79,9 @@ minstrel_stats_open(struct inode *inode, struct file *file) 
		p += sprintf(p, "%3u%s", mr->bitrate / 2,

				(mr->bitrate & 1 ? ".5" : "  "));



		tp = mr->cur_tp / ((18000 << 10) / 96);

		prob = mr->cur_prob / 18;

		eprob = mr->probability / 18;

		tp = MINSTREL_TRUNC(mr->cur_tp / 10);

		prob = MINSTREL_TRUNC(mr->cur_prob * 1000);

		eprob = MINSTREL_TRUNC(mr->probability * 1000);



		p += sprintf(p, "  %6u.%1u   %6u.%1u   %6u.%1u        "

				"%3u(%3u)   %8llu    %8llu\n",

net/mac80211/rc80211_minstrel_ht.h

+0 −5
Original line number Diff line number Diff line
@@ -16,11 +16,6 @@ 
#define MINSTREL_MAX_STREAMS	3

#define MINSTREL_STREAM_GROUPS	4



/* scaled fraction values */

#define MINSTREL_SCALE	16

#define MINSTREL_FRAC(val, div) (((val) << MINSTREL_SCALE) / div)

#define MINSTREL_TRUNC(val) ((val) >> MINSTREL_SCALE)



#define MCS_GROUP_RATES	8



struct mcs_group {