Commit 939c4c7e authored by Johannes Berg's avatar Johannes Berg
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
parent cdf0a0a8

net/mac80211/chan.c

+4 −3
Original line number Diff line number Diff line
@@ -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);

	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);

}