forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mac80211: minstrel_ht: include type (cck/ht) in rates flag

Browse source 
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:
Karl Beldan 2014-10-20 15:46:01 +02:00 • committed by Johannes Berg
commit 3ec373c421
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
net/mac80211/rc80211_minstrel_ht.c
View file

@ -51,6 +51,7 @@
[GROUP_IDX(_streams, _sgi, _ht40)] = { \ [GROUP_IDX(_streams, _sgi, _ht40)] = { \
.streams = _streams, \ .streams = _streams, \
.flags = \ .flags = \
IEEE80211_TX_RC_MCS | \
(_sgi ? IEEE80211_TX_RC_SHORT_GI : 0) | \ (_sgi ? IEEE80211_TX_RC_SHORT_GI : 0) | \
(_ht40 ? IEEE80211_TX_RC_40_MHZ_WIDTH : 0), \ (_ht40 ? IEEE80211_TX_RC_40_MHZ_WIDTH : 0), \
.duration = { \ .duration = { \
@ -83,6 +84,7 @@
#define CCK_GROUP \ #define CCK_GROUP \
[MINSTREL_CCK_GROUP] = { \ [MINSTREL_CCK_GROUP] = { \
.streams = 0, \ .streams = 0, \
.flags = 0, \
.duration = { \ .duration = { \
CCK_DURATION_LIST(false), \ CCK_DURATION_LIST(false), \
CCK_DURATION_LIST(true) \ 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]; const struct mcs_group *group = &minstrel_mcs_groups[index / MCS_GROUP_RATES];
struct minstrel_rate_stats *mr; struct minstrel_rate_stats *mr;
u8 idx; u8 idx;
u16 flags; u16 flags = group->flags;
mr = minstrel_get_ratestats(mi, index); mr = minstrel_get_ratestats(mi, index);
if (!mr->retry_updated) 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; 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)]; idx = mp->cck_rates[index % ARRAY_SIZE(mp->cck_rates)];
flags = 0; else
} else {
idx = index % MCS_GROUP_RATES + (group->streams - 1) * 8; idx = index % MCS_GROUP_RATES + (group->streams - 1) * 8;
flags = IEEE80211_TX_RC_MCS | group->flags;
}
if (offset > 0) { if (offset > 0) {
ratetbl->rate[offset].count = ratetbl->rate[offset].count_rts; 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) { if (sample_idx / MCS_GROUP_RATES == MINSTREL_CCK_GROUP) {
int idx = sample_idx % ARRAY_SIZE(mp->cck_rates); int idx = sample_idx % ARRAY_SIZE(mp->cck_rates);
rate->idx = mp->cck_rates[idx]; rate->idx = mp->cck_rates[idx];
rate->flags = 0; } else {
return; rate->idx = sample_idx % MCS_GROUP_RATES +
(sample_group->streams - 1) * 8;
} }
rate->idx = sample_idx % MCS_GROUP_RATES + rate->flags = sample_group->flags;
(sample_group->streams - 1) * 8;
rate->flags = IEEE80211_TX_RC_MCS | sample_group->flags;
} }
static void static void
@ -1006,14 +1004,16 @@ minstrel_ht_update_caps(void *priv, struct ieee80211_supported_band *sband,
mi->tx_flags |= IEEE80211_TX_CTL_LDPC; mi->tx_flags |= IEEE80211_TX_CTL_LDPC;
for (i = 0; i < ARRAY_SIZE(mi->groups); i++) { for (i = 0; i < ARRAY_SIZE(mi->groups); i++) {
u32 gflags = minstrel_mcs_groups[i].flags;
mi->groups[i].supported = 0; mi->groups[i].supported = 0;
if (i == MINSTREL_CCK_GROUP) { if (i == MINSTREL_CCK_GROUP) {
minstrel_ht_update_cck(mp, mi, sband, sta); minstrel_ht_update_cck(mp, mi, sband, sta);
continue; continue;
} }
if (minstrel_mcs_groups[i].flags & IEEE80211_TX_RC_SHORT_GI) { if (gflags & IEEE80211_TX_RC_SHORT_GI) {
if (minstrel_mcs_groups[i].flags & IEEE80211_TX_RC_40_MHZ_WIDTH) { if (gflags & IEEE80211_TX_RC_40_MHZ_WIDTH) {
if (!(sta_cap & IEEE80211_HT_CAP_SGI_40)) if (!(sta_cap & IEEE80211_HT_CAP_SGI_40))
continue; continue;
} else { } 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) sta->bandwidth < IEEE80211_STA_RX_BW_40)
continue; continue;