From: Miri Korenblit <miriam.rachel.korenblit@intel.com>
To: johannes@sipsolutions.net
Cc: linux-wireless@vger.kernel.org,
Benjamin Berg <benjamin.berg@intel.com>,
Johannes Berg <johannes.berg@intel.com>
Subject: [PATCH 11/15] wifi: mac80211: improve association error reporting slightly
Date: Mon, 18 Mar 2024 18:53:27 +0200 [thread overview]
Message-ID: <20240318184907.695faa9be279.I71b11a8d66a9cae4c27e242a47d1d92922609b03@changeid> (raw)
In-Reply-To: <20240318165331.3170594-1-miriam.rachel.korenblit@intel.com>
From: Benjamin Berg <benjamin.berg@intel.com>
There is no reason to check the request flags for each of the links, so
pull that out of the loop. Also, within the loop we can set the per-link
error everywhere.
Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
---
net/mac80211/mlme.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 958ff328a6c1..2434023317e9 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -8214,6 +8214,14 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
if (req->ap_mld_addr) {
uapsd_supported = true;
+ if (req->flags & (ASSOC_REQ_DISABLE_HT |
+ ASSOC_REQ_DISABLE_VHT |
+ ASSOC_REQ_DISABLE_HE |
+ ASSOC_REQ_DISABLE_EHT)) {
+ err = -EINVAL;
+ goto err_free;
+ }
+
for (i = 0; i < IEEE80211_MLD_MAX_NUM_LINKS; i++) {
struct ieee80211_supported_band *sband;
struct cfg80211_bss *link_cbss = req->links[i].bss;
@@ -8226,19 +8234,13 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
if (!bss->wmm_used) {
err = -EINVAL;
- goto err_free;
- }
-
- if (req->flags & (ASSOC_REQ_DISABLE_HT |
- ASSOC_REQ_DISABLE_VHT |
- ASSOC_REQ_DISABLE_HE |
- ASSOC_REQ_DISABLE_EHT)) {
- err = -EINVAL;
+ req->links[i].error = err;
goto err_free;
}
if (link_cbss->channel->band == NL80211_BAND_S1GHZ) {
err = -EINVAL;
+ req->links[i].error = err;
goto err_free;
}
--
2.34.1
next prev parent reply other threads:[~2024-03-18 16:54 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-18 16:53 [PATCH 00/15] cfg80211/mac80211 patches from our internal tree 2024-03-18 Miri Korenblit
2024-03-18 16:53 ` [PATCH 01/15] wifi: ieee80211: check for NULL in ieee80211_mle_size_ok() Miri Korenblit
2024-03-18 16:53 ` [PATCH 02/15] wifi: ieee80211: fix ieee80211_mle_basic_sta_prof_size_ok() Miri Korenblit
2024-03-18 16:53 ` [PATCH 03/15] wifi: mac80211_hwsim: move skip_beacons to be per link Miri Korenblit
2024-03-18 16:53 ` [PATCH 04/15] wifi: mac80211: clarify the dormant/suspended links docs Miri Korenblit
2024-03-18 16:53 ` [PATCH 05/15] wifi: mac80211: fix BSS_CHANGED_MLD_TTLM description Miri Korenblit
2024-03-18 16:53 ` [PATCH 06/15] wifi: mac80211: correctly set active links upon TTLM Miri Korenblit
2024-03-18 16:53 ` [PATCH 07/15] wifi: mac80211: handle indoor AFC/LPI AP on assoc success Miri Korenblit
2024-03-18 16:53 ` [PATCH 08/15] wifi: cfg80211: handle indoor AFC/LPI AP in probe response and beacon Miri Korenblit
2024-03-18 16:53 ` [PATCH 09/15] wifi: mac80211: add flag to disallow puncturing in 5 GHz Miri Korenblit
2024-03-18 16:53 ` [PATCH 10/15] wifi: mac80211: parse puncturing bitmap in 6 GHz Miri Korenblit
2024-03-18 16:53 ` Miri Korenblit [this message]
2024-03-18 16:53 ` [PATCH 12/15] wifi: cfg80211: check BSSID Index against MaxBSSID Miri Korenblit
2024-03-18 16:53 ` [PATCH 13/15] wifi: cfg80211: ignore non-TX BSSs in per-STA profile Miri Korenblit
2024-03-18 16:53 ` [PATCH 14/15] wifi: mac80211: fix prep_connection error path Miri Korenblit
2024-03-18 16:53 ` [PATCH 15/15] wifi: mac80211: add support for tearing down negotiated TTLM 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=20240318184907.695faa9be279.I71b11a8d66a9cae4c27e242a47d1d92922609b03@changeid \
--to=miriam.rachel.korenblit@intel.com \
--cc=benjamin.berg@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 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).