diff options
| author | Felix Fietkau <nbd@nbd.name> | 2021-01-27 06:57:35 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2021-02-12 08:58:22 +0100 |
| commit | c0eb09aa7e1cf141f8a623fe46fec8d9a9e74268 (patch) | |
| tree | f33515c4831f804907d7bdd5bcc2068f943adf66 /net/mac80211/rc80211_minstrel_ht.h | |
| parent | mac80211: minstrel_ht: show sampling rates in debugfs (diff) | |
| download | linux-c0eb09aa7e1cf141f8a623fe46fec8d9a9e74268.tar.xz linux-c0eb09aa7e1cf141f8a623fe46fec8d9a9e74268.zip | |
mac80211: minstrel_ht: remove sample rate switching code for constrained devices
This was added to mitigate the effects of too much sampling on devices that
use a static global fallback table instead of configurable multi-rate retry.
Now that the sampling algorithm is improved, this code path no longer performs
any better than the standard probing on affected devices.
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Link: https://lore.kernel.org/r/20210127055735.78599-6-nbd@nbd.name
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/rc80211_minstrel_ht.h')
| -rw-r--r-- | net/mac80211/rc80211_minstrel_ht.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/net/mac80211/rc80211_minstrel_ht.h b/net/mac80211/rc80211_minstrel_ht.h index 0d8c15f83f5d..06e7126727ad 100644 --- a/net/mac80211/rc80211_minstrel_ht.h +++ b/net/mac80211/rc80211_minstrel_ht.h @@ -75,7 +75,6 @@ struct minstrel_priv { struct ieee80211_hw *hw; bool has_mrr; - u32 sample_switch; unsigned int cw_min; unsigned int cw_max; unsigned int max_retry; @@ -147,12 +146,6 @@ struct minstrel_mcs_group_data { struct minstrel_rate_stats rates[MCS_GROUP_RATES]; }; -enum minstrel_sample_mode { - MINSTREL_SAMPLE_IDLE, - MINSTREL_SAMPLE_ACTIVE, - MINSTREL_SAMPLE_PENDING, -}; - struct minstrel_sample_category { u8 sample_group; u16 sample_rates[MINSTREL_SAMPLE_RATES]; @@ -182,23 +175,19 @@ struct minstrel_ht_sta { unsigned int overhead_legacy; unsigned int overhead_legacy_rtscts; - unsigned int total_packets_last; - unsigned int total_packets_cur; unsigned int total_packets; unsigned int sample_packets; /* tx flags to add for frames for this sta */ u32 tx_flags; - unsigned long sample_time; - struct minstrel_sample_category sample[__MINSTREL_SAMPLE_TYPE_MAX]; + u8 band; u8 sample_seq; - - enum minstrel_sample_mode sample_mode; u16 sample_rate; - u8 band; + unsigned long sample_time; + struct minstrel_sample_category sample[__MINSTREL_SAMPLE_TYPE_MAX]; /* Bitfield of supported MCS rates of all groups */ u16 supported[MINSTREL_GROUPS_NB]; |