From: Kieran Frewen <kieran.frewen@morsemicro.com>
To: johannes@sipsolutions.net
Cc: linux-wireless@vger.kernel.org, quic_jjohnson@quicinc.com,
Kieran Frewen <kieran.frewen@morsemicro.com>
Subject: [PATCH v2 12/12] mac80211_hwsim: support for S1G rate information
Date: Tue, 30 Aug 2022 02:20:17 +0000 [thread overview]
Message-ID: <20220830022017.51017-13-kieran.frewen@morsemicro.com> (raw)
In-Reply-To: <20220830022017.51017-1-kieran.frewen@morsemicro.com>
Include S1G rate information in S1G frames.
Signed-off-by: Kieran Frewen<kieran.frewen@morsemicro.com>
---
drivers/net/wireless/mac80211_hwsim.c | 38 ++++++++++++++++++++-------
1 file changed, 29 insertions(+), 9 deletions(-)
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 5ecbc80be338..6742f308ef7a 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -1577,7 +1577,14 @@ static bool mac80211_hwsim_tx_frame_no_nl(struct ieee80211_hw *hw,
rx_status.freq = chan->center_freq;
rx_status.freq_offset = chan->freq_offset;
rx_status.band = chan->band;
- if (info->control.rates[0].flags & IEEE80211_TX_RC_VHT_MCS) {
+ if (info->control.rates[0].flags & IEEE80211_TX_RC_S1G_MCS &&
+ rx_status.band == NL80211_BAND_S1GHZ) {
+ rx_status.rate_idx =
+ ieee80211_rate_get_s1g_mcs(&info->control.rates[0]);
+ rx_status.nss =
+ ieee80211_rate_get_s1g_nss(&info->control.rates[0]);
+ rx_status.encoding = RX_ENC_S1G;
+ } else if (info->control.rates[0].flags & IEEE80211_TX_RC_VHT_MCS) {
rx_status.rate_idx =
ieee80211_rate_get_vht_mcs(&info->control.rates[0]);
rx_status.nss =
@@ -1588,14 +1595,27 @@ static bool mac80211_hwsim_tx_frame_no_nl(struct ieee80211_hw *hw,
if (info->control.rates[0].flags & IEEE80211_TX_RC_MCS)
rx_status.encoding = RX_ENC_HT;
}
- if (info->control.rates[0].flags & IEEE80211_TX_RC_40_MHZ_WIDTH)
- rx_status.bw = RATE_INFO_BW_40;
- else if (info->control.rates[0].flags & IEEE80211_TX_RC_80_MHZ_WIDTH)
- rx_status.bw = RATE_INFO_BW_80;
- else if (info->control.rates[0].flags & IEEE80211_TX_RC_160_MHZ_WIDTH)
- rx_status.bw = RATE_INFO_BW_160;
- else
- rx_status.bw = RATE_INFO_BW_20;
+ if (rx_status.band == NL80211_BAND_S1GHZ) {
+ if (info->control.rates[0].flags & IEEE80211_TX_RC_2_MHZ_WIDTH)
+ rx_status.bw = RATE_INFO_BW_2;
+ else if (info->control.rates[0].flags & IEEE80211_TX_RC_4_MHZ_WIDTH)
+ rx_status.bw = RATE_INFO_BW_4;
+ else if (info->control.rates[0].flags & IEEE80211_TX_RC_8_MHZ_WIDTH)
+ rx_status.bw = RATE_INFO_BW_8;
+ else if (info->control.rates[0].flags & IEEE80211_TX_RC_16_MHZ_WIDTH)
+ rx_status.bw = RATE_INFO_BW_16;
+ else
+ rx_status.bw = RATE_INFO_BW_1;
+ } else {
+ if (info->control.rates[0].flags & IEEE80211_TX_RC_40_MHZ_WIDTH)
+ rx_status.bw = RATE_INFO_BW_40;
+ else if (info->control.rates[0].flags & IEEE80211_TX_RC_80_MHZ_WIDTH)
+ rx_status.bw = RATE_INFO_BW_80;
+ else if (info->control.rates[0].flags & IEEE80211_TX_RC_160_MHZ_WIDTH)
+ rx_status.bw = RATE_INFO_BW_160;
+ else
+ rx_status.bw = RATE_INFO_BW_20;
+ }
if (info->control.rates[0].flags & IEEE80211_TX_RC_SHORT_GI)
rx_status.enc_flags |= RX_ENC_FLAG_SHORT_GI;
/* TODO: simulate optional packet loss */
--
2.25.1
prev parent reply other threads:[~2022-08-30 2:21 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-30 2:20 [PATCH v2 00/12] Additional Support for 802.11ah (S1G) Kieran Frewen
2022-08-30 2:20 ` [PATCH v2 01/12] cfg80211: regulatory: extend regulatory support for S1G Kieran Frewen
2022-08-30 4:52 ` kernel test robot
2022-08-30 9:31 ` kernel test robot
2022-09-02 8:44 ` Dan Carpenter
2022-08-30 2:20 ` [PATCH v2 02/12] mac80211: update TIM for S1G specification changes Kieran Frewen
2022-08-30 2:20 ` [PATCH v2 03/12] mac80211: S1G beacon/short beacon support Kieran Frewen
2022-08-30 2:20 ` [PATCH v2 04/12] nl80211: support setting S1G short beacon period Kieran Frewen
2022-08-30 2:20 ` [PATCH v2 05/12] nl80211: support advertising S1G capabilities Kieran Frewen
2022-08-30 2:20 ` [PATCH v2 06/12] mac80211: support ieee80211_ext format Kieran Frewen
2022-08-30 2:20 ` [PATCH v2 07/12] mac80211: S1G capabilities information element in probe request Kieran Frewen
2022-08-30 2:20 ` [PATCH v2 08/12] cfg80211: S1G rate flags Kieran Frewen
2022-08-30 2:20 ` [PATCH v2 09/12] nl80211: support advertising S1G rate information Kieran Frewen
2022-08-30 2:20 ` [PATCH v2 10/12] mac80211: support S1G rate encoding Kieran Frewen
2022-08-30 2:20 ` [PATCH v2 11/12] cfg80211: support for calculating S1G bitrates Kieran Frewen
2022-08-30 2:20 ` Kieran Frewen [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220830022017.51017-13-kieran.frewen@morsemicro.com \
--to=kieran.frewen@morsemicro.com \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=quic_jjohnson@quicinc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox