From: Miri Korenblit <miriam.rachel.korenblit@intel.com>
To: johannes@sipsolutions.net
Cc: linux-wireless@vger.kernel.org,
Johannes Berg <johannes.berg@intel.com>,
Gregory Greenman <gregory.greenman@intel.com>
Subject: [PATCH 4/8] wifi: mac80211: simplify HE capability access
Date: Thu, 11 Jan 2024 18:17:42 +0200 [thread overview]
Message-ID: <20240111181514.2ef62b43caeb.I8baa604dd3f3399e08b86c99395a2c6a1185d35d@changeid> (raw)
In-Reply-To: <20240111161746.3978601-1-miriam.rachel.korenblit@intel.com>
From: Johannes Berg <johannes.berg@intel.com>
For verifying the required HE capabilities are supported
locally, we access the HE capability element of the AP.
Simplify that access, we've already parsed and validated
it when parsing elements.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-by: Gregory Greenman <gregory.greenman@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
---
net/mac80211/mlme.c | 32 +++++---------------------------
1 file changed, 5 insertions(+), 27 deletions(-)
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 45be270eaab7..5b1bc84760d5 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -4547,41 +4547,17 @@ static u8 ieee80211_max_rx_chains(struct ieee80211_link_data *link,
static bool
ieee80211_verify_peer_he_mcs_support(struct ieee80211_sub_if_data *sdata,
- const struct cfg80211_bss_ies *ies,
+ const struct ieee80211_he_cap_elem *he_cap,
const struct ieee80211_he_operation *he_op)
{
- const struct element *he_cap_elem;
- const struct ieee80211_he_cap_elem *he_cap;
struct ieee80211_he_mcs_nss_supp *he_mcs_nss_supp;
u16 mcs_80_map_tx, mcs_80_map_rx;
u16 ap_min_req_set;
- int mcs_nss_size;
int nss;
- he_cap_elem = cfg80211_find_ext_elem(WLAN_EID_EXT_HE_CAPABILITY,
- ies->data, ies->len);
-
- if (!he_cap_elem)
+ if (!he_cap)
return false;
- /* invalid HE IE */
- if (he_cap_elem->datalen < 1 + sizeof(*he_cap)) {
- sdata_info(sdata,
- "Invalid HE elem, Disable HE\n");
- return false;
- }
-
- /* skip one byte ext_tag_id */
- he_cap = (void *)(he_cap_elem->data + 1);
- mcs_nss_size = ieee80211_he_mcs_nss_size(he_cap);
-
- /* invalid HE IE */
- if (he_cap_elem->datalen < 1 + sizeof(*he_cap) + mcs_nss_size) {
- sdata_info(sdata,
- "Invalid HE elem with nss size, Disable HE\n");
- return false;
- }
-
/* mcs_nss is right after he_cap info */
he_mcs_nss_supp = (void *)(he_cap + 1);
@@ -4946,7 +4922,9 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata,
}
}
- if (!ieee80211_verify_peer_he_mcs_support(sdata, ies, he_oper) ||
+ if (!ieee80211_verify_peer_he_mcs_support(sdata,
+ (void *)elems->he_cap,
+ he_oper) ||
!ieee80211_verify_sta_he_mcs_support(sdata, sband, he_oper))
*conn_flags |= IEEE80211_CONN_DISABLE_HE |
IEEE80211_CONN_DISABLE_EHT;
--
2.34.1
next prev parent reply other threads:[~2024-01-11 16:18 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-11 16:17 [PATCH 0/8] cfg80211/mac80211 patches from our internal tree 2024-01-11 Miri Korenblit
2024-01-11 16:17 ` [PATCH 1/8] wifi: mac80211_hwsim: advertise 15 simultaneous links Miri Korenblit
2024-01-11 16:17 ` [PATCH 2/8] wifi: mac80211: simplify ieee80211_config_bw() prototype Miri Korenblit
2024-01-11 16:17 ` [PATCH 3/8] wifi: mac80211: remove extra element parsing Miri Korenblit
2024-01-11 16:17 ` Miri Korenblit [this message]
2024-01-11 16:17 ` [PATCH 5/8] wifi: mac80211: disallow drivers with HT wider than HE Miri Korenblit
2024-01-11 20:39 ` Jonathan Bither
2024-01-12 10:21 ` Johannes Berg
2024-01-12 17:27 ` Jonathan Bither
2024-01-12 13:10 ` Kalle Valo
2024-01-12 18:42 ` Johannes Berg
2024-01-12 19:58 ` Ben Greear
2024-01-15 22:00 ` Johannes Berg
2024-01-15 23:14 ` Ben Greear
2024-01-13 6:54 ` Kalle Valo
2024-01-11 16:17 ` [PATCH 6/8] wifi: mac80211: fix potential sta-link leak Miri Korenblit
2024-01-11 16:17 ` [PATCH 7/8] wifi: mac80211: don't set bss_conf in parsing Miri Korenblit
2024-01-11 16:17 ` [PATCH 8/8] wifi: mac80211: use deflink and fix typo in link ID check Miri Korenblit
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=20240111181514.2ef62b43caeb.I8baa604dd3f3399e08b86c99395a2c6a1185d35d@changeid \
--to=miriam.rachel.korenblit@intel.com \
--cc=gregory.greenman@intel.com \
--cc=johannes.berg@intel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.