Commit 46a5ebaf authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

cfg80211/mac80211: use lockdep_assert_held 



Instead of using a WARN_ON(!mutex_is_locked())
use lockdep_assert_held() which compiles away
completely when lockdep isn't enabled, and
also is a more accurate assertion since it
checks that the current thread is holding the
mutex.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f5521b13

net/mac80211/chan.c

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ __ieee80211_get_channel_mode(struct ieee80211_local *local, 
{

	struct ieee80211_sub_if_data *sdata;



	WARN_ON(!mutex_is_locked(&local->iflist_mtx));

	lockdep_assert_held(&local->iflist_mtx);



	list_for_each_entry(sdata, &local->interfaces, list) {

		if (sdata == ignore)

net/mac80211/key.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static const u8 bcast_addr[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; 


static void assert_key_lock(struct ieee80211_local *local)

{

	WARN_ON(!mutex_is_locked(&local->key_mtx));

	lockdep_assert_held(&local->key_mtx);

}



static struct ieee80211_sta *get_sta_for_key(struct ieee80211_key *key)

net/mac80211/mlme.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ enum rx_mgmt_action { 
/* utils */

static inline void ASSERT_MGD_MTX(struct ieee80211_if_managed *ifmgd)

{

	WARN_ON(!mutex_is_locked(&ifmgd->mtx));

	lockdep_assert_held(&ifmgd->mtx);

}



/*

net/mac80211/sta_info.c

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ static int sta_info_finish_insert(struct sta_info *sta, bool async) 
	unsigned long flags;

	int err = 0;



	WARN_ON(!mutex_is_locked(&local->sta_mtx));

	lockdep_assert_held(&local->sta_mtx);



	/* notify driver */

	if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)

net/mac80211/util.c

+2 −2
Original line number Diff line number Diff line
@@ -1296,9 +1296,9 @@ void ieee80211_recalc_smps(struct ieee80211_local *local, 
	int count = 0;



	if (forsdata)

		WARN_ON(!mutex_is_locked(&forsdata->u.mgd.mtx));

		lockdep_assert_held(&forsdata->u.mgd.mtx);



	WARN_ON(!mutex_is_locked(&local->iflist_mtx));

	lockdep_assert_held(&local->iflist_mtx);



	/*

	 * This function could be improved to handle multiple