summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlan Peer <ilan.peer@intel.com>2023-03-21 10:03:46 +0200
committeriwlwifi publisher <>2023-04-20 09:32:35 +0000
commit9b5130b3e93f1d2a9eac38bd6b5349e98e8498f1 (patch)
treefa9508e130d6b6aa7cf022e92286fe143750a844
parent2aedd5db894711973a489f4904d8675a89fde132 (diff)
downloadbackport-iwlwifi-9b5130b3e93f1d2a9eac38bd6b5349e98e8498f1.tar.gz
wifi: mac80211: Print local link address during authentication
To ease debugging, mostly in cases that authentication fails. type=feature ticket=none Change-Id: I0032e9d6e01325862189e4a20b02ddbe8f2f5e75 Signed-off-by: Ilan Peer <ilan.peer@intel.com> Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/48292 automatic-review: iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> tested: iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> Reviewed-by: Greenman, Gregory <gregory.greenman@intel.com> x-iwlwifi-stack-dev: 6978f11f8f703e52d994f5a011e210253165e0f6
-rw-r--r--net/mac80211/mlme.c16
-rw-r--r--versions2
2 files changed, 15 insertions, 3 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 7cb9e702a2..8f7f8c460b 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -7151,6 +7151,7 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,
struct ieee80211_local *local = sdata->local;
struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
struct ieee80211_mgd_auth_data *auth_data;
+ struct ieee80211_link_data *link;
u16 auth_alg;
int err;
bool cont_auth;
@@ -7274,8 +7275,6 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,
false);
}
- sdata_info(sdata, "authenticate with %pM\n", auth_data->ap_addr);
-
/* needed for transmitting the auth frame(s) properly */
memcpy(sdata->vif.cfg.ap_addr, auth_data->ap_addr, ETH_ALEN);
@@ -7284,6 +7283,19 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,
if (err)
goto err_clear;
+ if (req->link_id > 0)
+ link = sdata_dereference(sdata->link[req->link_id], sdata);
+ else
+ link = sdata_dereference(sdata->link[0], sdata);
+
+ if (WARN_ON(!link)) {
+ err = -ENOLINK;
+ goto err_clear;
+ }
+
+ sdata_info(sdata, "authenticate with %pM (local address=%pM)\n",
+ auth_data->ap_addr, link->conf->addr);
+
err = ieee80211_auth(sdata);
if (err) {
sta_info_destroy_addr(sdata, auth_data->ap_addr);
diff --git a/versions b/versions
index 439fa3abd5..f641b41747 100644
--- a/versions
+++ b/versions
@@ -2,4 +2,4 @@ BACKPORTS_VERSION="(see git)"
BACKPORTED_KERNEL_VERSION="(see git)"
BACKPORTED_KERNEL_NAME="iwlwifi"
BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__
-BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11167:019bd3ca"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11168:6978f11f"