summaryrefslogtreecommitdiff
path: root/net/mac80211/link.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2023-08-28 15:00:01 +0300
committerJohannes Berg <johannes.berg@intel.com>2023-09-11 12:27:22 +0300
commit4d3acf4311a0401e3e97c2f2302256cd9d7f5692 (patch)
tree6277e7906606c83ba38921acac8e66e66429512a /net/mac80211/link.c
parenta26787aa13974fb0b3fb42bfeb4256c1b686e305 (diff)
downloadlinux-4d3acf4311a0401e3e97c2f2302256cd9d7f5692.tar.xz
wifi: mac80211: remove sta_mtx
We now hold the wiphy mutex everywhere that we use or needed the sta_mtx, so we don't need this mutex any more. Remove it. Most of this change was done automatically with spatch. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/link.c')
-rw-r--r--net/mac80211/link.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/link.c b/net/mac80211/link.c
index 72b5000502a5..71815b8d44af 100644
--- a/net/mac80211/link.c
+++ b/net/mac80211/link.c
@@ -455,7 +455,7 @@ int __ieee80211_set_active_links(struct ieee80211_vif *vif, u16 active_links)
int ret;
sdata_assert_lock(sdata);
- mutex_lock(&local->sta_mtx);
+ lockdep_assert_wiphy(local->hw.wiphy);
mutex_lock(&local->mtx);
mutex_lock(&local->key_mtx);
old_active = sdata->vif.active_links;
@@ -475,7 +475,6 @@ int __ieee80211_set_active_links(struct ieee80211_vif *vif, u16 active_links)
}
mutex_unlock(&local->key_mtx);
mutex_unlock(&local->mtx);
- mutex_unlock(&local->sta_mtx);
return ret;
}