From: Miri Korenblit <miriam.rachel.korenblit@intel.com>
To: johannes@sipsolutions.net
Cc: linux-wireless@vger.kernel.org,
Benjamin Berg <benjamin.berg@intel.com>,
Ilan Peer <ilan.peer@intel.com>
Subject: [PATCH 8/8] wifi: mac80211: use deflink and fix typo in link ID check
Date: Thu, 11 Jan 2024 18:17:46 +0200 [thread overview]
Message-ID: <20240111181514.4c4b1c40eb3c.I2771621dee328c618536596b7e56232df42a79c8@changeid> (raw)
In-Reply-To: <20240111161746.3978601-1-miriam.rachel.korenblit@intel.com>
From: Benjamin Berg <benjamin.berg@intel.com>
This does not change anything effectively, but it is closer to what the
code is trying to achieve here. i.e. select the link data if it is an
MLD and fall back to using the deflink otherwise.
Fixes: 0f99f0878350 ("wifi: mac80211: Print local link address during authentication")
Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
Reviewed-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
---
net/mac80211/mlme.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 99188bd84799..cc9a8eaffa6b 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -7869,10 +7869,10 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,
if (err)
goto err_clear;
- if (req->link_id > 0)
+ if (req->link_id >= 0)
link = sdata_dereference(sdata->link[req->link_id], sdata);
else
- link = sdata_dereference(sdata->link[0], sdata);
+ link = &sdata->deflink;
if (WARN_ON(!link)) {
err = -ENOLINK;
--
2.34.1
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 ` [PATCH 4/8] wifi: mac80211: simplify HE capability access Miri Korenblit
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 ` Miri Korenblit [this message]
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.4c4b1c40eb3c.I2771621dee328c618536596b7e56232df42a79c8@changeid \
--to=miriam.rachel.korenblit@intel.com \
--cc=benjamin.berg@intel.com \
--cc=ilan.peer@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.