]> git.baikalelectronics.ru Git - kernel.git/commit
wifi: mac80211: mlme: fix override calculation
authorJohannes Berg <johannes.berg@intel.com>
Sun, 17 Jul 2022 16:16:51 +0000 (18:16 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 22 Jul 2022 12:27:45 +0000 (14:27 +0200)
commit58d4247963215b0b0380f6b7ba21a589e062be70
treeb6fe8e06555860cee89e6392959774535b490277
parentf9636d75209a017c63fe9eeb6ab7866781eb3f0c
wifi: mac80211: mlme: fix override calculation

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: 40f2147be710 ("wifi: mac80211: mlme: refactor assoc link setup")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/mlme.c