2020-08-03 08:51:58

by John Crispin

Subject: [PATCH V5 2/3] mac80211: add support for setting fixed HE rate/gi/ltf

From: Miles Hu <[email protected]>

With nl80211 now able to receive fixed HE rate/gi/ltf settings we want to
propagate these further down the stack into the mac80211 drivers. This
patch copies the values into the sdata struct.

Signed-off-by: Miles Hu <[email protected]>
Signed-off-by: John Crispin <[email protected]>
---
net/mac80211/cfg.c | 11 +++++++++++
net/mac80211/ieee80211_i.h | 3 +++
2 files changed, 14 insertions(+)

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 24e9e00decb8..efee1a4e0600 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -2863,9 +2863,13 @@ static int ieee80211_set_bitrate_mask(struct wiphy *wiphy,
memcpy(sdata->rc_rateidx_vht_mcs_mask[i],
mask->control[i].vht_mcs,
sizeof(mask->control[i].vht_mcs));
+ memcpy(sdata->rc_rateidx_he_mcs_mask[i],
+ mask->control[i].he_mcs,
+ sizeof(mask->control[i].he_mcs));

sdata->rc_has_mcs_mask[i] = false;
sdata->rc_has_vht_mcs_mask[i] = false;
+ sdata->rc_has_he_mcs_mask[i] = false;
if (!sband)
continue;

@@ -2882,6 +2886,13 @@ static int ieee80211_set_bitrate_mask(struct wiphy *wiphy,
break;
}
}
+
+ for (j = 0; j < NL80211_HE_NSS_MAX; j++) {
+ if (~sdata->rc_rateidx_he_mcs_mask[i][j]) {
+ sdata->rc_has_he_mcs_mask[i] = true;
+ break;
+ }
+ }
}

return 0;
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 0b1eaec6649f..19ff8a2ff7b6 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -967,6 +967,9 @@ struct ieee80211_sub_if_data {
u32 beacon_rateidx_mask[NUM_NL80211_BANDS];
bool beacon_rate_set;

+ bool rc_has_he_mcs_mask[NUM_NL80211_BANDS];
+ u16 rc_rateidx_he_mcs_mask[NUM_NL80211_BANDS][NL80211_HE_NSS_MAX];
+
union {
struct ieee80211_if_ap ap;
struct ieee80211_if_wds wds;
--
2.25.1

2020-08-03 09:17:05

by Johannes Berg

Subject: Re: [PATCH V5 2/3] mac80211: add support for setting fixed HE rate/gi/ltf

On Mon, 2020-08-03 at 10:51 +0200, John Crispin wrote:
> From: Miles Hu <[email protected]>
>
> With nl80211 now able to receive fixed HE rate/gi/ltf settings we want to
> propagate these further down the stack into the mac80211 drivers. This
> patch copies the values into the sdata struct.

I do not see any reason for this patch, copying data to a mac80211
internal structure and then not using it does ... nothing. Dropped this
patch.

johannes