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 v4 07/17] mac80211: convert S1G beacon to scan results
Date: Mon, 21 Sep 2020 19:28:08 -0700 [thread overview]
Message-ID: <20200922022818.15855-8-thomas@adapt-ip.com> (raw)
In-Reply-To: <20200922022818.15855-1-thomas@adapt-ip.com>
This commit finds the correct offset for Information
Elements in S1G beacon frames so they can be reported in
scan results.
Signed-off-by: Thomas Pedersen <thomas@adapt-ip.com>
---
v4:
- remove bss->s1g (Johannes)
- use sizeof() when checking IE lengths and don't parse
short beacon element (yet) (Johannes)
---
net/mac80211/ieee80211_i.h | 3 +++
net/mac80211/rx.c | 3 ++-
net/mac80211/scan.c | 17 +++++++++++++----
net/mac80211/util.c | 22 ++++++++++++++++++++++
4 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 27b73891aa4c..32b9631a458e 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1536,6 +1536,9 @@ struct ieee802_11_elems {
u8 dtim_count;
u8 dtim_period;
const struct ieee80211_addba_ext_ie *addba_ext_ie;
+ const struct ieee80211_s1g_cap *s1g_capab;
+ const struct ieee80211_s1g_oper_ie *s1g_oper;
+ const struct ieee80211_s1g_bcn_compat_ie *s1g_bcn_compat;
/* length of them, respectively */
u8 ext_capab_len;
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index b04d6e01a346..7cc423bd38bb 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -4577,7 +4577,8 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
ieee80211_verify_alignment(&rx);
if (unlikely(ieee80211_is_probe_resp(hdr->frame_control) ||
- ieee80211_is_beacon(hdr->frame_control)))
+ ieee80211_is_beacon(hdr->frame_control) ||
+ ieee80211_is_s1g_beacon(hdr->frame_control)))
ieee80211_scan_rx(local, skb);
if (ieee80211_is_data(fc)) {
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index d2d6ff37a77b..d5fa627c5acc 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -146,7 +146,8 @@ ieee80211_bss_info_update(struct ieee80211_local *local,
struct ieee80211_mgmt *mgmt, size_t len,
struct ieee80211_channel *channel)
{
- bool beacon = ieee80211_is_beacon(mgmt->frame_control);
+ bool beacon = ieee80211_is_beacon(mgmt->frame_control) ||
+ ieee80211_is_s1g_beacon(mgmt->frame_control);
struct cfg80211_bss *cbss, *non_tx_cbss;
struct ieee80211_bss *bss, *non_tx_bss;
struct cfg80211_inform_bss bss_meta = {
@@ -195,6 +196,11 @@ ieee80211_bss_info_update(struct ieee80211_local *local,
elements = mgmt->u.probe_resp.variable;
baselen = offsetof(struct ieee80211_mgmt,
u.probe_resp.variable);
+ } else if (ieee80211_is_s1g_beacon(mgmt->frame_control)) {
+ struct ieee80211_ext *ext = (void *) mgmt;
+
+ baselen = offsetof(struct ieee80211_ext, u.s1g_beacon.variable);
+ elements = ext->u.s1g_beacon.variable;
} else {
baselen = offsetof(struct ieee80211_mgmt, u.beacon.variable);
elements = mgmt->u.beacon.variable;
@@ -246,9 +252,12 @@ void ieee80211_scan_rx(struct ieee80211_local *local, struct sk_buff *skb)
struct ieee80211_bss *bss;
struct ieee80211_channel *channel;
- if (skb->len < 24 ||
- (!ieee80211_is_probe_resp(mgmt->frame_control) &&
- !ieee80211_is_beacon(mgmt->frame_control)))
+ if (ieee80211_is_s1g_beacon(mgmt->frame_control)) {
+ if (skb->len < 15)
+ return;
+ } else if (skb->len < 24 ||
+ (!ieee80211_is_probe_resp(mgmt->frame_control) &&
+ !ieee80211_is_beacon(mgmt->frame_control)))
return;
sdata1 = rcu_dereference(local->scan_sdata);
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 27b2f1ceca69..ba2810a6fae8 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1003,6 +1003,10 @@ _ieee802_11_parse_elems_crc(const u8 *start, size_t len, bool action,
case WLAN_EID_LINK_ID:
case WLAN_EID_BSS_MAX_IDLE_PERIOD:
case WLAN_EID_RSNX:
+ case WLAN_EID_S1G_BCN_COMPAT:
+ case WLAN_EID_S1G_CAPABILITIES:
+ case WLAN_EID_S1G_OPERATION:
+ case WLAN_EID_S1G_SHORT_BCN_INTERVAL:
/*
* not listing WLAN_EID_CHANNEL_SWITCH_WRAPPER -- it seems possible
* that if the content gets bigger it might be needed more than once
@@ -1288,6 +1292,24 @@ _ieee802_11_parse_elems_crc(const u8 *start, size_t len, bool action,
&crc : NULL,
elem, elems);
break;
+ case WLAN_EID_S1G_CAPABILITIES:
+ if (elen == sizeof(*elems->s1g_capab))
+ elems->s1g_capab = (void *)pos;
+ else
+ elem_parse_failed = true;
+ break;
+ case WLAN_EID_S1G_OPERATION:
+ if (elen == sizeof(*elems->s1g_oper))
+ elems->s1g_oper = (void *)pos;
+ else
+ elem_parse_failed = true;
+ break;
+ case WLAN_EID_S1G_BCN_COMPAT:
+ if (elen == sizeof(*elems->s1g_bcn_compat))
+ elems->s1g_bcn_compat = (void *)pos;
+ else
+ elem_parse_failed = true;
+ break;
default:
break;
}
--
2.20.1
next prev parent reply other threads:[~2020-09-22 5:37 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-22 2:28 [PATCH v4 00/17] add support for S1G association Thomas Pedersen
2020-09-22 2:28 ` [PATCH v4 01/17] {cfg,mac}80211: get correct default channel width for S1G Thomas Pedersen
2020-09-22 2:28 ` [PATCH v4 02/17] mac80211: s1g: choose scanning width based on frequency Thomas Pedersen
2020-09-22 2:28 ` [PATCH v4 03/17] nl80211: support S1G capabilities Thomas Pedersen
2020-09-22 2:28 ` [PATCH v4 04/17] mac80211: support S1G STA capabilities Thomas Pedersen
2020-09-22 2:28 ` [PATCH v4 05/17] cfg80211: convert S1G beacon to scan results Thomas Pedersen
2020-09-22 2:28 ` [PATCH v4 06/17] cfg80211: parse S1G Operation element for BSS channel Thomas Pedersen
2020-09-22 2:28 ` Thomas Pedersen [this message]
2020-09-22 2:28 ` [PATCH v4 08/17] cfg80211: handle Association Response from S1G STA Thomas Pedersen
2020-09-22 2:28 ` [PATCH v4 09/17] mac80211: encode listen interval for S1G Thomas Pedersen
2020-09-22 2:28 ` [PATCH v4 10/17] mac80211: don't calculate duration " Thomas Pedersen
2020-09-22 2:28 ` [PATCH v4 11/17] mac80211: handle S1G low rates Thomas Pedersen
2020-09-22 2:28 ` [PATCH v4 12/17] mac80211: avoid rate init for S1G band Thomas Pedersen
2020-09-22 2:28 ` [PATCH v4 13/17] mac80211: receive and process S1G beacons Thomas Pedersen
2020-12-08 7:44 ` Wen Gong
2020-12-08 18:19 ` Thomas Pedersen
2020-12-09 2:48 ` Wen Gong
2020-09-22 2:28 ` [PATCH v4 14/17] mac80211: support S1G association Thomas Pedersen
2020-09-28 12:17 ` Johannes Berg
2020-09-29 17:07 ` Thomas Pedersen
2020-11-23 8:38 ` Wen Gong
2020-11-23 8:39 ` Wen Gong
2020-11-23 18:40 ` Thomas Pedersen
2020-11-24 3:59 ` Wen Gong
2020-11-24 7:04 ` Thomas Pedersen
2020-09-22 2:28 ` [PATCH v4 15/17] nl80211: include frequency offset in survey info Thomas Pedersen
2020-09-22 2:28 ` [PATCH v4 16/17] mac80211_hwsim: fix TSF timestamp write to S1G beacon Thomas Pedersen
2020-09-22 2:28 ` [PATCH v4 17/17] mac80211_hwsim: indicate support for S1G 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=20200922022818.15855-8-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).