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 10/22] cfg80211: convert S1G beacon to scan results
Date: Mon, 31 Aug 2020 13:55:48 -0700 [thread overview]
Message-ID: <20200831205600.21058-11-thomas@adapt-ip.com> (raw)
In-Reply-To: <20200831205600.21058-1-thomas@adapt-ip.com>
The S1G beacon is an extension frame as opposed to
management frame for the regular beacon. This means we may
have to occasionally cast the frame buffer to a different
header type. Luckily this isn't too bad as scan results
mostly only care about the IEs.
Signed-off-by: Thomas Pedersen <thomas@adapt-ip.com>
---
include/linux/ieee80211.h | 32 ++++++++++++++++++++++
net/wireless/scan.c | 57 ++++++++++++++++++++++++++++++++-------
2 files changed, 80 insertions(+), 9 deletions(-)
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 53fba39d4ba6..bca4bb443291 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -151,6 +151,9 @@
#define IEEE80211_ANO_NETTYPE_WILD 15
+/* bits unique to S1G beacon */
+#define IEEE80211_S1G_BCN_NEXT_TBTT 0x100
+
/* control extension - for IEEE80211_FTYPE_CTL | IEEE80211_STYPE_CTL_EXT */
#define IEEE80211_CTL_EXT_POLL 0x2000
#define IEEE80211_CTL_EXT_SPR 0x3000
@@ -553,6 +556,28 @@ static inline bool ieee80211_is_s1g_beacon(__le16 fc)
cpu_to_le16(IEEE80211_FTYPE_EXT | IEEE80211_STYPE_S1G_BEACON);
}
+/**
+ * ieee80211_next_tbtt_present - check if IEEE80211_FTYPE_EXT &&
+ * IEEE80211_STYPE_S1G_BEACON && IEEE80211_S1G_BCN_NEXT_TBTT
+ * @fc: frame control bytes in little-endian byteorder
+ */
+static inline bool ieee80211_next_tbtt_present(__le16 fc)
+{
+ return (fc & cpu_to_le16(IEEE80211_FCTL_FTYPE | IEEE80211_FCTL_STYPE)) ==
+ cpu_to_le16(IEEE80211_FTYPE_EXT | IEEE80211_STYPE_S1G_BEACON) &&
+ fc & cpu_to_le16(IEEE80211_S1G_BCN_NEXT_TBTT);
+}
+
+/**
+ * ieee80211_is_s1g_short_beacon - check if next tbtt present bit is set. Only
+ * true for S1G beacons when they're short.
+ * @fc: frame control bytes in little-endian byteorder
+ */
+static inline bool ieee80211_is_s1g_short_beacon(__le16 fc)
+{
+ return ieee80211_is_s1g_beacon(fc) && ieee80211_next_tbtt_present(fc);
+}
+
/**
* ieee80211_is_atim - check if IEEE80211_FTYPE_MGMT && IEEE80211_STYPE_ATIM
* @fc: frame control bytes in little-endian byteorder
@@ -1034,6 +1059,13 @@ struct ieee80211_ext {
u8 change_seq;
u8 variable[0];
} __packed s1g_beacon;
+ struct {
+ u8 sa[ETH_ALEN];
+ __le32 timestamp;
+ u8 change_seq;
+ u8 next_tbtt[3];
+ u8 variable[0];
+ } __packed s1g_short_beacon;
} u;
} __packed __aligned(2);
diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index 84fc8ab16dd2..b4c85e8f2107 100644
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -1807,8 +1807,11 @@ cfg80211_inform_single_bss_frame_data(struct wiphy *wiphy,
struct cfg80211_bss_ies *ies;
struct ieee80211_channel *channel;
bool signal_valid;
- size_t ielen = len - offsetof(struct ieee80211_mgmt,
- u.probe_resp.variable);
+ struct ieee80211_ext *ext = NULL;
+ u8 *bssid, *variable;
+ u16 capability, beacon_int;
+ size_t ielen, min_hdr_len = offsetof(struct ieee80211_mgmt,
+ u.probe_resp.variable);
int bss_type;
BUILD_BUG_ON(offsetof(struct ieee80211_mgmt, u.probe_resp.variable) !=
@@ -1826,21 +1829,57 @@ cfg80211_inform_single_bss_frame_data(struct wiphy *wiphy,
(data->signal < 0 || data->signal > 100)))
return NULL;
- if (WARN_ON(len < offsetof(struct ieee80211_mgmt, u.probe_resp.variable)))
+ if (ieee80211_is_s1g_beacon(mgmt->frame_control)) {
+ ext = (void *) mgmt;
+ min_hdr_len = offsetof(struct ieee80211_ext, u.s1g_beacon);
+ if (ieee80211_is_s1g_short_beacon(mgmt->frame_control))
+ min_hdr_len = offsetof(struct ieee80211_ext,
+ u.s1g_short_beacon.variable);
+ }
+
+ if (WARN_ON(len < min_hdr_len))
return NULL;
- channel = cfg80211_get_bss_channel(wiphy, mgmt->u.beacon.variable,
+ ielen = len - min_hdr_len;
+ variable = mgmt->u.probe_resp.variable;
+ if (ext) {
+ if (ieee80211_is_s1g_short_beacon(mgmt->frame_control))
+ variable = ext->u.s1g_short_beacon.variable;
+ else
+ variable = ext->u.s1g_beacon.variable;
+ }
+
+ channel = cfg80211_get_bss_channel(wiphy, variable,
ielen, data->chan, data->scan_width);
if (!channel)
return NULL;
+ if (ext) {
+ struct ieee80211_s1g_bcn_compat_ie *compat;
+ u8 *ie;
+
+ ie = (void *)cfg80211_find_ie(WLAN_EID_S1G_BCN_COMPAT,
+ variable, ielen);
+ if (!ie)
+ return NULL;
+ compat = (void *)(ie + 2);
+ bssid = ext->u.s1g_beacon.sa;
+ capability = le16_to_cpu(compat->compat_info);
+ beacon_int = le16_to_cpu(compat->beacon_int);
+ } else {
+ bssid = mgmt->bssid;
+ beacon_int = le16_to_cpu(mgmt->u.probe_resp.beacon_int);
+ capability = le16_to_cpu(mgmt->u.probe_resp.capab_info);
+ }
+
ies = kzalloc(sizeof(*ies) + ielen, gfp);
if (!ies)
return NULL;
ies->len = ielen;
ies->tsf = le64_to_cpu(mgmt->u.probe_resp.timestamp);
- ies->from_beacon = ieee80211_is_beacon(mgmt->frame_control);
- memcpy(ies->data, mgmt->u.probe_resp.variable, ielen);
+ ies->from_beacon = ieee80211_is_beacon(mgmt->frame_control) ||
+ ieee80211_is_s1g_beacon(mgmt->frame_control);
+ memcpy(ies->data, variable, ielen);
if (ieee80211_is_probe_resp(mgmt->frame_control))
rcu_assign_pointer(tmp.pub.proberesp_ies, ies);
@@ -1848,12 +1887,12 @@ cfg80211_inform_single_bss_frame_data(struct wiphy *wiphy,
rcu_assign_pointer(tmp.pub.beacon_ies, ies);
rcu_assign_pointer(tmp.pub.ies, ies);
- memcpy(tmp.pub.bssid, mgmt->bssid, ETH_ALEN);
+ memcpy(tmp.pub.bssid, bssid, ETH_ALEN);
+ tmp.pub.beacon_interval = beacon_int;
+ tmp.pub.capability = capability;
tmp.pub.channel = channel;
tmp.pub.scan_width = data->scan_width;
tmp.pub.signal = data->signal;
- tmp.pub.beacon_interval = le16_to_cpu(mgmt->u.probe_resp.beacon_int);
- tmp.pub.capability = le16_to_cpu(mgmt->u.probe_resp.capab_info);
tmp.ts_boottime = data->boottime_ns;
tmp.parent_tsf = data->parent_tsf;
tmp.pub.chains = data->chains;
--
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 ` [PATCH v2 02/22] nl80211: advertise supported channel width in S1G Thomas Pedersen
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 ` Thomas Pedersen [this message]
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-11-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;
as well as URLs for NNTP newsgroup(s).