projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fc3432a
)
wifi: mac80211: fix waiting for beacons logic
author
Johannes Berg
<johannes.berg@intel.com>
Wed, 31 Jan 2024 15:48:56 +0000
(16:48 +0100)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Fri, 16 Feb 2024 18:10:47 +0000
(19:10 +0100)
[ Upstream commit
a0b4f2291319c5d47ecb196b90400814fdcfd126
]
This should be waiting if we don't have a beacon yet,
but somehow I managed to invert the logic. Fix that.
Fixes:
74e1309acedc
("wifi: mac80211: mlme: look up beacon elems only if needed")
Link:
https://msgid.link/20240131164856.922701229546.I239b379e7cee04608e73c016b737a5245e5b23dd@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/mac80211/mlme.c
patch
|
blob
|
history
diff --git
a/net/mac80211/mlme.c
b/net/mac80211/mlme.c
index
73f8df0
..
d9e716f
100644
(file)
--- a/
net/mac80211/mlme.c
+++ b/
net/mac80211/mlme.c
@@
-7727,8
+7727,7
@@
int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
rcu_read_lock();
beacon_ies = rcu_dereference(req->bss->beacon_ies);
-
- if (beacon_ies) {
+ if (!beacon_ies) {
/*
* Wait up to one beacon interval ...
* should this be more if we miss one?