From: Thomas Pedersen <thomas@adapt-ip.com>
To: Johannes Berg <johannes@sipsolutions.net>
Cc: linux-wireless <linux-wireless@vger.kernel.org>,
Thomas Pedersen <thomas@adapt-ip.com>
Subject: [PATCH v2 02/22] nl80211: advertise supported channel width in S1G
Date: Mon, 31 Aug 2020 13:55:40 -0700 [thread overview]
Message-ID: <20200831205600.21058-3-thomas@adapt-ip.com> (raw)
In-Reply-To: <20200831205600.21058-1-thomas@adapt-ip.com>
S1G supports 5 channel widths: 1, 2, 4, 8, and 16. One
channel width is allowed per frequency in each operating
class, so it makes more sense to advertise the specific
channel width allowed.
Signed-off-by: Thomas Pedersen <thomas@adapt-ip.com>
---
include/net/cfg80211.h | 15 +++++++++++++++
include/uapi/linux/nl80211.h | 15 +++++++++++++++
net/wireless/nl80211.c | 15 +++++++++++++++
3 files changed, 45 insertions(+)
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index c9bce9bba511..e4d4fbcb2edc 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -96,6 +96,16 @@ struct wiphy;
* @IEEE80211_CHAN_NO_10MHZ: 10 MHz bandwidth is not permitted
* on this channel.
* @IEEE80211_CHAN_NO_HE: HE operation is not permitted on this channel.
+ * @IEEE80211_CHAN_1MHZ: 1 MHz bandwidth is permitted
+ * on this channel.
+ * @IEEE80211_CHAN_2MHZ: 2 MHz bandwidth is permitted
+ * on this channel.
+ * @IEEE80211_CHAN_4MHZ: 4 MHz bandwidth is permitted
+ * on this channel.
+ * @IEEE80211_CHAN_8MHZ: 8 MHz bandwidth is permitted
+ * on this channel.
+ * @IEEE80211_CHAN_16MHZ: 16 MHz bandwidth is permitted
+ * on this channel.
*
*/
enum ieee80211_channel_flags {
@@ -113,6 +123,11 @@ enum ieee80211_channel_flags {
IEEE80211_CHAN_NO_20MHZ = 1<<11,
IEEE80211_CHAN_NO_10MHZ = 1<<12,
IEEE80211_CHAN_NO_HE = 1<<13,
+ IEEE80211_CHAN_1MHZ = 1<<14,
+ IEEE80211_CHAN_2MHZ = 1<<15,
+ IEEE80211_CHAN_4MHZ = 1<<16,
+ IEEE80211_CHAN_8MHZ = 1<<17,
+ IEEE80211_CHAN_16MHZ = 1<<18,
};
#define IEEE80211_CHAN_NO_HT40 \
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index 0584e0d349f0..4e119c6afa31 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -3737,6 +3737,16 @@ enum nl80211_wmm_rule {
* @NL80211_FREQUENCY_ATTR_NO_HE: HE operation is not allowed on this channel
* in current regulatory domain.
* @NL80211_FREQUENCY_ATTR_OFFSET: frequency offset in KHz
+ * @NL80211_FREQUENCY_ATTR_1MHZ: 1 MHz operation is allowed
+ * on this channel in current regulatory domain.
+ * @NL80211_FREQUENCY_ATTR_2MHZ: 2 MHz operation is allowed
+ * on this channel in current regulatory domain.
+ * @NL80211_FREQUENCY_ATTR_4MHZ: 4 MHz operation is allowed
+ * on this channel in current regulatory domain.
+ * @NL80211_FREQUENCY_ATTR_8MHZ: 8 MHz operation is allowed
+ * on this channel in current regulatory domain.
+ * @NL80211_FREQUENCY_ATTR_16MHZ: 16 MHz operation is allowed
+ * on this channel in current regulatory domain.
* @NL80211_FREQUENCY_ATTR_MAX: highest frequency attribute number
* currently defined
* @__NL80211_FREQUENCY_ATTR_AFTER_LAST: internal use
@@ -3768,6 +3778,11 @@ enum nl80211_frequency_attr {
NL80211_FREQUENCY_ATTR_WMM,
NL80211_FREQUENCY_ATTR_NO_HE,
NL80211_FREQUENCY_ATTR_OFFSET,
+ NL80211_FREQUENCY_ATTR_1MHZ,
+ NL80211_FREQUENCY_ATTR_2MHZ,
+ NL80211_FREQUENCY_ATTR_4MHZ,
+ NL80211_FREQUENCY_ATTR_8MHZ,
+ NL80211_FREQUENCY_ATTR_16MHZ,
/* keep last */
__NL80211_FREQUENCY_ATTR_AFTER_LAST,
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 52a35e788547..7da4d84bcc1a 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -1010,6 +1010,21 @@ static int nl80211_msg_put_channel(struct sk_buff *msg, struct wiphy *wiphy,
if ((chan->flags & IEEE80211_CHAN_NO_HE) &&
nla_put_flag(msg, NL80211_FREQUENCY_ATTR_NO_HE))
goto nla_put_failure;
+ if ((chan->flags & IEEE80211_CHAN_1MHZ) &&
+ nla_put_flag(msg, NL80211_FREQUENCY_ATTR_1MHZ))
+ goto nla_put_failure;
+ if ((chan->flags & IEEE80211_CHAN_2MHZ) &&
+ nla_put_flag(msg, NL80211_FREQUENCY_ATTR_2MHZ))
+ goto nla_put_failure;
+ if ((chan->flags & IEEE80211_CHAN_4MHZ) &&
+ nla_put_flag(msg, NL80211_FREQUENCY_ATTR_4MHZ))
+ goto nla_put_failure;
+ if ((chan->flags & IEEE80211_CHAN_8MHZ) &&
+ nla_put_flag(msg, NL80211_FREQUENCY_ATTR_8MHZ))
+ goto nla_put_failure;
+ if ((chan->flags & IEEE80211_CHAN_16MHZ) &&
+ nla_put_flag(msg, NL80211_FREQUENCY_ATTR_16MHZ))
+ goto nla_put_failure;
}
if (nla_put_u32(msg, NL80211_FREQUENCY_ATTR_MAX_TX_POWER,
--
2.20.1
next prev parent reply other threads:[~2020-08-31 20:56 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-31 20:55 [PATCH v2 00/22] add support for S1G association Thomas Pedersen
2020-08-31 20:55 ` [PATCH v2 01/22] ieee80211: redefine S1G bits with GENMASK Thomas Pedersen
2020-08-31 20:55 ` Thomas Pedersen [this message]
2020-08-31 20:55 ` [PATCH v2 03/22] cfg80211: regulatory: handle S1G channels Thomas Pedersen
2020-09-05 18:38 ` Thomas Pedersen
2020-08-31 20:55 ` [PATCH v2 04/22] nl80211: correctly validate S1G beacon head Thomas Pedersen
2020-08-31 20:55 ` [PATCH v2 05/22] nl80211: support setting S1G channels Thomas Pedersen
2020-08-31 20:55 ` [PATCH v2 06/22] {cfg,mac}80211: get correct default channel width for S1G Thomas Pedersen
2020-09-18 10:38 ` Johannes Berg
2020-09-21 4:59 ` Thomas Pedersen
2020-09-21 7:01 ` Johannes Berg
2020-09-21 16:26 ` Thomas Pedersen
2020-08-31 20:55 ` [PATCH v2 07/22] mac80211: s1g: choose scanning width based on frequency Thomas Pedersen
2020-09-18 10:40 ` Johannes Berg
2020-09-21 5:06 ` Thomas Pedersen
2020-09-21 6:58 ` Johannes Berg
2020-08-31 20:55 ` [PATCH v2 08/22] nl80211: support S1G capabilities Thomas Pedersen
2020-09-18 10:41 ` Johannes Berg
2020-09-18 10:47 ` Johannes Berg
2020-09-21 4:34 ` Thomas Pedersen
2020-08-31 20:55 ` [PATCH v2 09/22] mac80211: support S1G STA capabilities Thomas Pedersen
2020-08-31 20:55 ` [PATCH v2 10/22] cfg80211: convert S1G beacon to scan results Thomas Pedersen
2020-08-31 20:55 ` [PATCH v2 11/22] cfg80211: parse S1G Operation element for BSS channel Thomas Pedersen
2020-09-18 10:45 ` Johannes Berg
2020-09-21 5:12 ` Thomas Pedersen
2020-09-21 6:54 ` Johannes Berg
2020-08-31 20:55 ` [PATCH v2 12/22] mac80211: convert S1G beacon to scan results Thomas Pedersen
2020-09-18 10:48 ` Johannes Berg
2020-09-21 5:45 ` Thomas Pedersen
2020-08-31 20:55 ` [PATCH v2 13/22] cfg80211: handle Association Response from S1G STA Thomas Pedersen
2020-09-18 10:50 ` Johannes Berg
2020-09-21 5:52 ` Thomas Pedersen
2020-08-31 20:55 ` [PATCH v2 14/22] mac80211: encode listen interval for S1G Thomas Pedersen
2020-09-18 10:51 ` Johannes Berg
2020-09-21 5:56 ` Thomas Pedersen
2020-08-31 20:55 ` [PATCH v2 15/22] mac80211: don't calculate duration " Thomas Pedersen
2020-09-18 10:52 ` Johannes Berg
2020-09-18 10:55 ` Johannes Berg
2020-09-21 6:03 ` Thomas Pedersen
2020-09-21 6:51 ` Johannes Berg
2020-08-31 20:55 ` [PATCH v2 16/22] mac80211: handle S1G low rates Thomas Pedersen
2020-08-31 20:55 ` [PATCH v2 17/22] mac80211: avoid rate init for S1G band Thomas Pedersen
2020-08-31 20:55 ` [PATCH v2 18/22] mac80211: receive and process S1G beacons Thomas Pedersen
2020-08-31 20:55 ` [PATCH v2 19/22] mac80211: support S1G association Thomas Pedersen
2020-08-31 20:55 ` [PATCH v2 20/22] nl80211: include frequency offset in survey info Thomas Pedersen
2020-08-31 20:55 ` [PATCH v2 21/22] mac80211_hwsim: indicate support for S1G Thomas Pedersen
2020-09-06 8:49 ` [mac80211_hwsim] 8cafe19852: hwsim.fst_ap_config_default.fail kernel test robot
2020-09-08 18:00 ` Thomas Pedersen
2020-09-08 18:41 ` Johannes Berg
2020-09-08 18:53 ` Thomas Pedersen
2020-08-31 20:56 ` [PATCH v2 22/22] mac80211_hwsim: fix TSF timestamp write to S1G beacon Thomas Pedersen
2020-09-06 16:04 ` [PATCH v2 00/22] add support for S1G association Johannes Berg
2020-09-08 18:30 ` Thomas Pedersen
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=20200831205600.21058-3-thomas@adapt-ip.com \
--to=thomas@adapt-ip.com \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
/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