renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-11-27 12:04:22 +08:00
Code

wifi: mac80211: improve association error reporting slightly

Browse Source 
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>
Link: https://msgid.link/20240318184907.695faa9be279.I71b11a8d66a9cae4c27e242a47d1d92922609b03@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Benjamin Berg 2024-03-18 18:53:27 +02:00 committed by Johannes Berg
parent 6943e00331
commit 0dfedd48ac
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
net/mac80211/mlme.c
View File

@ -8206,6 +8206,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;
@ -8218,19 +8226,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;
}