diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2023-08-28 14:00:05 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2023-09-11 11:27:22 +0200 |
| commit | 0cd8080e46b834fa72026112488ab61d4b82f03a (patch) | |
| tree | 9fc6171d8ed5ddf0cc06a4978c4653d5b906e714 /net/mac80211/ocb.c | |
| parent | 463559b7c3fe5fab1a4b60cd3454ef84a5dc51b8 (diff) | |
wifi: mac80211: remove local->mtx
We now hold the wiphy mutex everywhere that we use or
needed the local->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/ocb.c')
| -rw-r--r-- | net/mac80211/ocb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac80211/ocb.c b/net/mac80211/ocb.c index b44896e14522..7661e96454b2 100644 --- a/net/mac80211/ocb.c +++ b/net/mac80211/ocb.c @@ -178,6 +178,8 @@ int ieee80211_ocb_join(struct ieee80211_sub_if_data *sdata, u64 changed = BSS_CHANGED_OCB | BSS_CHANGED_BSSID; int err; + lockdep_assert_wiphy(sdata->local->hw.wiphy); + if (ifocb->joined == true) return -EINVAL; @@ -185,10 +187,8 @@ int ieee80211_ocb_join(struct ieee80211_sub_if_data *sdata, sdata->deflink.smps_mode = IEEE80211_SMPS_OFF; sdata->deflink.needed_rx_chains = sdata->local->rx_chains; - mutex_lock(&sdata->local->mtx); err = ieee80211_link_use_channel(&sdata->deflink, &setup->chandef, IEEE80211_CHANCTX_SHARED); - mutex_unlock(&sdata->local->mtx); if (err) return err; @@ -209,6 +209,8 @@ int ieee80211_ocb_leave(struct ieee80211_sub_if_data *sdata) struct ieee80211_local *local = sdata->local; struct sta_info *sta; + lockdep_assert_wiphy(sdata->local->hw.wiphy); + ifocb->joined = false; sta_info_flush(sdata); @@ -228,9 +230,7 @@ int ieee80211_ocb_leave(struct ieee80211_sub_if_data *sdata) clear_bit(SDATA_STATE_OFFCHANNEL, &sdata->state); ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_OCB); - mutex_lock(&sdata->local->mtx); ieee80211_link_release_channel(&sdata->deflink); - mutex_unlock(&sdata->local->mtx); skb_queue_purge(&sdata->skb_queue); |