[PATCH wireless-next 0/2] wifi: S1G radiotap support

[PATCH wireless-next 0/2] wifi: S1G radiotap support

[Lachlan Hodges]

Definitions for S1G radiotap fields and report the channel as 900MHz.

lachlan

Lachlan Hodges (2):
  wifi: radiotap: add S1G TLVs and channel frequency
  wifi: mac80211: report 900MHz channel for S1G band radiotap header

 include/net/ieee80211_radiotap.h | 66 ++++++++++++++++++++++++++++++++
 net/mac80211/rx.c                |  2 +
 2 files changed, 68 insertions(+)

-- 
2.43.0

[PATCH wireless-next 1/2] wifi: radiotap: add S1G TLVs and channel frequency

[Lachlan Hodges]

Add the necessary definitions to create radiotap S1G TLVs
and channel flags for S1G sniffers.

Signed-off-by: Lachlan Hodges <lachlan.hodges@morsemicro.com>
---
 include/net/ieee80211_radiotap.h | 66 ++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/include/net/ieee80211_radiotap.h b/include/net/ieee80211_radiotap.h
index 8bbaf77da7cf..27ee67b38ea8 100644
--- a/include/net/ieee80211_radiotap.h
+++ b/include/net/ieee80211_radiotap.h
@@ -93,6 +93,7 @@ enum ieee80211_radiotap_presence {
 	IEEE80211_RADIOTAP_RADIOTAP_NAMESPACE = 29,
 	IEEE80211_RADIOTAP_VENDOR_NAMESPACE = 30,
 	IEEE80211_RADIOTAP_EXT = 31,
+	IEEE80211_RADIOTAP_S1G = 32,
 	IEEE80211_RADIOTAP_EHT_USIG = 33,
 	IEEE80211_RADIOTAP_EHT = 34,
 	IEEE80211_RADIOTAP_UHR_ELR = 37,
@@ -112,6 +113,9 @@ enum ieee80211_radiotap_flags {
 
 /* for IEEE80211_RADIOTAP_CHANNEL */
 enum ieee80211_radiotap_channel_flags {
+	IEEE80211_CHAN_700MHZ = 0x0001,
+	IEEE80211_CHAN_800MHZ = 0x0002,
+	IEEE80211_CHAN_900MHZ = 0x0004,
 	IEEE80211_CHAN_CCK = 0x0020,
 	IEEE80211_CHAN_OFDM = 0x0040,
 	IEEE80211_CHAN_2GHZ = 0x0080,
@@ -792,6 +796,68 @@ enum ieee80211_radiotap_uhr_user_info {
 	IEEE80211_RADIOTAP_UHR_USER_INFO_2X_LDPC		= 0x02000000,
 };
 
+/*
+ * ieee80211_radiotap_s1g - content of S1G TLV (type 32)
+ * see www.radiotap.org/fields/S1G.html for details
+ */
+struct ieee80211_radiotap_s1g {
+	__le16 known;
+	__le16 data1;
+	__le16 data2;
+} __packed;
+
+enum ieee80211_radiotap_s1g_known {
+	IEEE80211_RADIOTAP_S1G_KNOWN_PPDU_FORMAT	= 0x0001,
+	IEEE80211_RADIOTAP_S1G_KNOWN_RESPONSE_IND	= 0x0002,
+	IEEE80211_RADIOTAP_S1G_KNOWN_GI			= 0x0004,
+	IEEE80211_RADIOTAP_S1G_KNOWN_NSS		= 0x0008,
+	IEEE80211_RADIOTAP_S1G_KNOWN_BW			= 0x0010,
+	IEEE80211_RADIOTAP_S1G_KNOWN_MCS		= 0x0020,
+	IEEE80211_RADIOTAP_S1G_KNOWN_COLOR		= 0x0040,
+	IEEE80211_RADIOTAP_S1G_KNOWN_UPLINK_IND		= 0x0080,
+};
+
+enum ieee80211_radiotap_s1g_data1 {
+	IEEE80211_RADIOTAP_S1G_DATA1_PPDU_FORMAT	= 0x0003,
+	IEEE80211_RADIOTAP_S1G_DATA1_RESPONSE_IND	= 0x000c,
+	IEEE80211_RADIOTAP_S1G_DATA1_GI			= 0x0020,
+	IEEE80211_RADIOTAP_S1G_DATA1_NSS		= 0x00c0,
+	IEEE80211_RADIOTAP_S1G_DATA1_BW			= 0x0f00,
+	IEEE80211_RADIOTAP_S1G_DATA1_MCS		= 0xf000,
+};
+
+enum ieee80211_radiotap_s1g_data2 {
+	IEEE80211_RADIOTAP_S1G_DATA2_COLOR		= 0x0007,
+	IEEE80211_RADIOTAP_S1G_DATA2_UPLINK_IND		= 0x0008,
+	IEEE80211_RADIOTAP_S1G_DATA2_RSSI		= 0xff00,
+};
+
+enum ieee80211_radiotap_s1g_ppdu_format {
+	IEEE80211_RADIOTAP_S1G_PPDU_FORMAT_1M		= 0,
+	IEEE80211_RADIOTAP_S1G_PPDU_FORMAT_SHORT	= 1,
+	IEEE80211_RADIOTAP_S1G_PPDU_FORMAT_LONG		= 2,
+};
+
+enum ieee80211_radiotap_s1g_response_ind {
+	IEEE80211_RADIOTAP_S1G_RESPONSE_IND_NONE	= 0,
+	IEEE80211_RADIOTAP_S1G_RESPONSE_IND_NDP		= 1,
+	IEEE80211_RADIOTAP_S1G_RESPONSE_IND_NORMAL	= 2,
+	IEEE80211_RADIOTAP_S1G_RESPONSE_IND_LONG	= 3,
+};
+
+enum ieee80211_radiotap_s1g_gi {
+	IEEE80211_RADIOTAP_S1G_GI_LONG			= 0,
+	IEEE80211_RADIOTAP_S1G_GI_SHORT			= 1,
+};
+
+enum ieee80211_radiotap_s1g_bw {
+	IEEE80211_RADIOTAP_S1G_BW_1MHZ			= 0,
+	IEEE80211_RADIOTAP_S1G_BW_2MHZ			= 1,
+	IEEE80211_RADIOTAP_S1G_BW_4MHZ			= 2,
+	IEEE80211_RADIOTAP_S1G_BW_8MHZ			= 3,
+	IEEE80211_RADIOTAP_S1G_BW_16MHZ			= 4,
+};
+
 /**
  * ieee80211_get_radiotap_len - get radiotap header length
  * @data: pointer to the header
-- 
2.43.0

[PATCH wireless-next 2/2] wifi: mac80211: report 900MHz channel for S1G band radiotap header

[Lachlan Hodges]

Currently S1G frames are reported as 2GHz spectrum, use the 900MHz
channel flag instead.

Signed-off-by: Lachlan Hodges <lachlan.hodges@morsemicro.com>
---
 net/mac80211/rx.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 5e26be8e27d8..edb53e5b4462 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -452,6 +452,8 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local,
 	if (status->band == NL80211_BAND_5GHZ ||
 	    status->band == NL80211_BAND_6GHZ)
 		channel_flags |= IEEE80211_CHAN_OFDM | IEEE80211_CHAN_5GHZ;
+	else if (status->band == NL80211_BAND_S1GHZ)
+		channel_flags |= IEEE80211_CHAN_OFDM | IEEE80211_CHAN_900MHZ;
 	else if (status->encoding != RX_ENC_LEGACY)
 		channel_flags |= IEEE80211_CHAN_DYN | IEEE80211_CHAN_2GHZ;
 	else if (rate && rate->flags & IEEE80211_RATE_ERP_G)
-- 
2.43.0

Re: [PATCH wireless-next 0/2] wifi: S1G radiotap support

[Lachlan Hodges]

On Wed, Sep 09, 2026 at 05:30:12PM +1000, Lachlan Hodges wrote:
> Definitions for S1G radiotap fields and report the channel as 900MHz.

I was just about to send the driver patch separately, but then I realise
it won't pass NIPA because they are built as a set ._.

I guess you can apply the definitions and then once I get them in my
tree I can send the driver patch. Let me know if you'd prefer
another way.

lachlan