diff options
| author |   Thomas Huehn <thomas@net.t-labs.tu-berlin.de> | 2015-03-24 21:09:39 +0100 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2015-04-01 20:44:31 +0200 |
| commit | 9134073bc693633b5e1f1a7252c93b3fb262aae4 (patch) | |
| tree | bc3d44c87bbcf5006f45f0afbd45da209a2101ee /net/mac80211/rc80211_minstrel.h | |
| parent | mac80211: unify Minstrel & Minstrel-HTs calculation of rate statistics (diff) | |
| download | linux-dev-9134073bc693633b5e1f1a7252c93b3fb262aae4.tar.xz linux-dev-9134073bc693633b5e1f1a7252c93b3fb262aae4.zip | |
mac80211: improve Minstrel variable & function naming
This patch ensures a consistent usage of variable names for type
"minstrel_rate_stats" to be used as "mrs" and from type minstrel_rate
as "mr" across both Minstrel & Minstrel-HT. In addition some
variable and function names got changed to more meaningful ones.
Signed-off-by: Thomas Huehn <thomas@net.t-labs.tu-berlin.de>
Acked-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/rc80211_minstrel.h')
| -rw-r--r-- | net/mac80211/rc80211_minstrel.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/net/mac80211/rc80211_minstrel.h b/net/mac80211/rc80211_minstrel.h index 728144c8df3f..58f287028437 100644 --- a/net/mac80211/rc80211_minstrel.h +++ b/net/mac80211/rc80211_minstrel.h @@ -38,11 +38,14 @@ struct minstrel_rate_stats { /* total attempts/success counters */ u64 att_hist, succ_hist; - /* current throughput */ + /* current EWMA of rate throughput */ unsigned int cur_tp; - /* packet delivery probabilities */ - unsigned int cur_prob, probability; + /* statistis of packet delivery probability + * cur_prob - current prob within last update intervall + * prob_ewma - exponential weighted moving average of prob */ + unsigned int cur_prob; + unsigned int prob_ewma; /* maximum retry counts */ u8 retry_count; @@ -70,7 +73,7 @@ struct minstrel_rate { struct minstrel_sta_info { struct ieee80211_sta *sta; - unsigned long stats_update; + unsigned long last_stats_update; unsigned int sp_ack_dur; unsigned int rate_avg; @@ -133,7 +136,7 @@ void minstrel_add_sta_debugfs(void *priv, void *priv_sta, struct dentry *dir); void minstrel_remove_sta_debugfs(void *priv, void *priv_sta); /* Recalculate success probabilities and counters for a given rate using EWMA */ -void minstrel_calc_rate_stats(struct minstrel_rate_stats *mr); +void minstrel_calc_rate_stats(struct minstrel_rate_stats *mrs); /* debugfs */ int minstrel_stats_open(struct inode *inode, struct file *file); |