Skip to content

Commit

Permalink
wifi: mac80211: use deflink and fix typo in link ID check
Browse files Browse the repository at this point in the history
[ Upstream commit e10322810ce0d0d4a5a319458c4e1e052c6fe9be ]

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: 0f99f08 ("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>
Link: https://msgid.link/20240111181514.4c4b1c40eb3c.I2771621dee328c618536596b7e56232df42a79c8@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
benzea authored and Sasha Levin committed Mar 26, 2024
1 parent 5885020 commit fb9b88e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions net/mac80211/mlme.c
Expand Up @@ -7502,10 +7502,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;
Expand Down

0 comments on commit fb9b88e

Please sign in to comment.