summaryrefslogtreecommitdiff
path: root/net/mac80211/sta_info.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-04-27 09:33:21 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-04-27 09:33:21 +0200
commite947861d0ccbc765af4512a395251e6af6857600 (patch)
treee2b8d646f40016e887162bcaf53859edaae15bc9 /net/mac80211/sta_info.c
parent6f1c0268a4871a80c0ec78142eeb1fe0556e898a (diff)
parent6a8b55ed4056ea5559ebe4f6a4b247f627870d4c (diff)
downloadlwn-e947861d0ccbc765af4512a395251e6af6857600.tar.gz
lwn-e947861d0ccbc765af4512a395251e6af6857600.zip
Merge 5.7-rc3 into tty-next
We need the tty/serial fixes in here too. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/mac80211/sta_info.c')
-rw-r--r--net/mac80211/sta_info.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index f8d5c2515829..cd8487bc6fc2 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -231,7 +231,8 @@ struct sta_info *sta_info_get_by_idx(struct ieee80211_sub_if_data *sdata,
struct sta_info *sta;
int i = 0;
- list_for_each_entry_rcu(sta, &local->sta_list, list) {
+ list_for_each_entry_rcu(sta, &local->sta_list, list,
+ lockdep_is_held(&local->sta_mtx)) {
if (sdata != sta->sdata)
continue;
if (i < idx) {