mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-05 08:26:59 +00:00
Code Issues Releases Wiki Activity

wifi: mac80211: mlme: fix override calculation

Browse source 
In my previous changes here, I neglected to take the old
conn_flags into account that might still be present from
the authentication, and thus ieee80211_setup_assoc_link()
can misbehave, as well as the override calculation being
wrong. Fix that by ORing in the old flags.

Fixes: 1845c1d4a4 ("wifi: mac80211: mlme: refactor assoc link setup")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2022-07-17 18:16:51 +02:00
parent 8a9be422f5
commit 553a282cb2
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/mac80211/mlme.c
View file

@ -7048,6 +7048,8 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
goto err_clear;
}
/* keep old conn_flags from ieee80211_prep_channel() from auth */
conn_flags |= link->u.mgd.conn_flags;
conn_flags |= ieee80211_setup_assoc_link(sdata, assoc_data, req,
conn_flags, assoc_link_id);
override = link->u.mgd.conn_flags != conn_flags;