diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-09-15 13:28:15 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-09-16 21:46:00 +0200 |
commit | 46a5ebaf02d69e26ee0f47a0b8d2d9bc619240d4 (patch) | |
tree | 77bc5ceee61ce125c4b608d7b979bf8d033ffdcc /net/mac80211/util.c | |
parent | mac80211: use correct station flags lock (diff) | |
download | linux-46a5ebaf02d69e26ee0f47a0b8d2d9bc619240d4.tar.xz linux-46a5ebaf02d69e26ee0f47a0b8d2d9bc619240d4.zip |
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: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/util.c')
-rw-r--r-- | net/mac80211/util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index bd40b11d5ab9..9f21a69f0917 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -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 |