wifi: mac80211: tighten locking check

When we remove a link that doesn't have a channel context,
we don't really need the local->mtx locking. Tighten the
check here.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
index 92fe4053909114e8347b50c008245ff0f0860046..5ab210706123a85557efd0e327c3a21f90ac1245 100644 (file)
--- a/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@ -1991,10 +1991,11 @@ void ieee80211_link_release_channel(struct ieee80211_link_data *link)
 
        WARN_ON(sdata->dev && netif_carrier_ok(sdata->dev));
 
-       lockdep_assert_held(&sdata->local->mtx);
-
        mutex_lock(&sdata->local->chanctx_mtx);
-       __ieee80211_link_release_channel(link);
+       if (rcu_access_pointer(link->conf->chanctx_conf)) {
+               lockdep_assert_held(&sdata->local->mtx);
+               __ieee80211_link_release_channel(link);
+       }
        mutex_unlock(&sdata->local->chanctx_mtx);
 }