wifi: mac80211: remove key_mtx
We now hold the wiphy mutex everywhere that we use or needed the key_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>
This commit is contained in:
@@ -456,8 +456,8 @@ int __ieee80211_set_active_links(struct ieee80211_vif *vif, u16 active_links)
|
||||
|
||||
sdata_assert_lock(sdata);
|
||||
lockdep_assert_wiphy(local->hw.wiphy);
|
||||
|
||||
mutex_lock(&local->mtx);
|
||||
mutex_lock(&local->key_mtx);
|
||||
old_active = sdata->vif.active_links;
|
||||
if (old_active & active_links) {
|
||||
/*
|
||||
@@ -473,7 +473,6 @@ int __ieee80211_set_active_links(struct ieee80211_vif *vif, u16 active_links)
|
||||
/* otherwise switch directly */
|
||||
ret = _ieee80211_set_active_links(sdata, active_links);
|
||||
}
|
||||
mutex_unlock(&local->key_mtx);
|
||||
mutex_unlock(&local->mtx);
|
||||
|
||||
return ret;
|
||||
|
||||
Reference in New Issue
Block a user