diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2024-02-29 15:38:03 +0100 |
|---|---|---|
| committer | iwlwifi publisher <> | 2024-04-17 13:01:43 +0000 |
| commit | 404601db7f99afcc88b9a51ecb768b9432cc3a54 (patch) | |
| tree | eaf205a701b25f569ad29971c4ae9fe62c63f79f | |
| parent | aaa6b786947f8177050201726df1b208677b73da (diff) | |
| download | backport-iwlwifi-404601db7f99afcc88b9a51ecb768b9432cc3a54.tar.gz | |
[BUGFIX] wifi: mac80211: always initialize match_auth
My previous patch only initialized match_auth when the
ifmgd->auth_data exists, but that was wrong, it should
always be set. Fix that.
type=bugfix
fixes=I3e61f4cfe9da89008e1854160093c76a1e69dc2a
ticket=none
Change-Id: I979dd222b3b5eb5e1437886e5f7c2355eeccb9f7
Fixes: 310c8387c638 ("wifi: mac80211: clean up connection process")
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/r/3151f5d0-c18f-413d-b34b-b94f095b947c@moroto.mountain
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/96888
automatic-review: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
tested: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
x-iwlwifi-stack-dev: 70e29adcf389c16e0c84bde09a17cfa6eb6a1366
| -rw-r--r-- | net/mac80211/mlme.c | 8 | ||||
| -rw-r--r-- | versions | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 2f683687e6..f9b0049f7b 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -8200,10 +8200,10 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, sizeof(ifmgd->s1g_capa_mask)); /* keep some setup (AP STA, channel, ...) if matching */ - if (ifmgd->auth_data) - match_auth = ether_addr_equal(ifmgd->auth_data->ap_addr, - assoc_data->ap_addr) && - ifmgd->auth_data->link_id == req->link_id; + match_auth = ifmgd->auth_data && + ether_addr_equal(ifmgd->auth_data->ap_addr, + assoc_data->ap_addr) && + ifmgd->auth_data->link_id == req->link_id; if (req->ap_mld_addr) { uapsd_supported = true; @@ -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:11959:7158f8e5" +BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11960:70e29adc" |