mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
mac80211: minstrel_ht: include type (cck/ht) in rates flag
ATM, we grep cck rates idx with idx / MCS_GROUP_RATES == MINSTREL_CCK_GROUP. Matching neither-cck-non-ht rates could be done by replacing '==' with '>', however it would be less versatile or explicit. This will allow to match VHT rates with IEEE80211_TX_RC_VHT_MCS. Signed-off-by: Karl Beldan <karl.beldan@rivierawaves.com> Cc: Felix Fietkau <nbd@openwrt.org> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
parent
8a0ee4fe19
commit
3ec373c421
1 changed files with 14 additions and 14 deletions
|
@ -51,6 +51,7 @@
|
|||
[GROUP_IDX(_streams, _sgi, _ht40)] = { \
|
||||
.streams = _streams, \
|
||||
.flags = \
|
||||
IEEE80211_TX_RC_MCS | \
|
||||
(_sgi ? IEEE80211_TX_RC_SHORT_GI : 0) | \
|
||||
(_ht40 ? IEEE80211_TX_RC_40_MHZ_WIDTH : 0), \
|
||||
.duration = { \
|
||||
|
@ -83,6 +84,7 @@
|
|||
#define CCK_GROUP \
|
||||
[MINSTREL_CCK_GROUP] = { \
|
||||
.streams = 0, \
|
||||
.flags = 0, \
|
||||
.duration = { \
|
||||
CCK_DURATION_LIST(false), \
|
||||
CCK_DURATION_LIST(true) \
|
||||
|
@ -716,7 +718,7 @@ minstrel_ht_set_rate(struct minstrel_priv *mp, struct minstrel_ht_sta *mi,
|
|||
const struct mcs_group *group = &minstrel_mcs_groups[index / MCS_GROUP_RATES];
|
||||
struct minstrel_rate_stats *mr;
|
||||
u8 idx;
|
||||
u16 flags;
|
||||
u16 flags = group->flags;
|
||||
|
||||
mr = minstrel_get_ratestats(mi, index);
|
||||
if (!mr->retry_updated)
|
||||
|
@ -732,13 +734,10 @@ minstrel_ht_set_rate(struct minstrel_priv *mp, struct minstrel_ht_sta *mi,
|
|||
ratetbl->rate[offset].count_rts = mr->retry_count_rtscts;
|
||||
}
|
||||
|
||||
if (index / MCS_GROUP_RATES == MINSTREL_CCK_GROUP) {
|
||||
if (index / MCS_GROUP_RATES == MINSTREL_CCK_GROUP)
|
||||
idx = mp->cck_rates[index % ARRAY_SIZE(mp->cck_rates)];
|
||||
flags = 0;
|
||||
} else {
|
||||
else
|
||||
idx = index % MCS_GROUP_RATES + (group->streams - 1) * 8;
|
||||
flags = IEEE80211_TX_RC_MCS | group->flags;
|
||||
}
|
||||
|
||||
if (offset > 0) {
|
||||
ratetbl->rate[offset].count = ratetbl->rate[offset].count_rts;
|
||||
|
@ -918,13 +917,12 @@ minstrel_ht_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta,
|
|||
if (sample_idx / MCS_GROUP_RATES == MINSTREL_CCK_GROUP) {
|
||||
int idx = sample_idx % ARRAY_SIZE(mp->cck_rates);
|
||||
rate->idx = mp->cck_rates[idx];
|
||||
rate->flags = 0;
|
||||
return;
|
||||
} else {
|
||||
rate->idx = sample_idx % MCS_GROUP_RATES +
|
||||
(sample_group->streams - 1) * 8;
|
||||
}
|
||||
|
||||
rate->idx = sample_idx % MCS_GROUP_RATES +
|
||||
(sample_group->streams - 1) * 8;
|
||||
rate->flags = IEEE80211_TX_RC_MCS | sample_group->flags;
|
||||
rate->flags = sample_group->flags;
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -1006,14 +1004,16 @@ minstrel_ht_update_caps(void *priv, struct ieee80211_supported_band *sband,
|
|||
mi->tx_flags |= IEEE80211_TX_CTL_LDPC;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(mi->groups); i++) {
|
||||
u32 gflags = minstrel_mcs_groups[i].flags;
|
||||
|
||||
mi->groups[i].supported = 0;
|
||||
if (i == MINSTREL_CCK_GROUP) {
|
||||
minstrel_ht_update_cck(mp, mi, sband, sta);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (minstrel_mcs_groups[i].flags & IEEE80211_TX_RC_SHORT_GI) {
|
||||
if (minstrel_mcs_groups[i].flags & IEEE80211_TX_RC_40_MHZ_WIDTH) {
|
||||
if (gflags & IEEE80211_TX_RC_SHORT_GI) {
|
||||
if (gflags & IEEE80211_TX_RC_40_MHZ_WIDTH) {
|
||||
if (!(sta_cap & IEEE80211_HT_CAP_SGI_40))
|
||||
continue;
|
||||
} else {
|
||||
|
@ -1022,7 +1022,7 @@ minstrel_ht_update_caps(void *priv, struct ieee80211_supported_band *sband,
|
|||
}
|
||||
}
|
||||
|
||||
if (minstrel_mcs_groups[i].flags & IEEE80211_TX_RC_40_MHZ_WIDTH &&
|
||||
if (gflags & IEEE80211_TX_RC_40_MHZ_WIDTH &&
|
||||
sta->bandwidth < IEEE80211_STA_RX_BW_40)
|
||||
continue;
|
||||
|
||||
|
|
Loading…
Reference in a new issue