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 15:46:00 -0400 |
| commit | 46a5ebaf02d69e26ee0f47a0b8d2d9bc619240d4 (patch) | |
| tree | 77bc5ceee61ce125c4b608d7b979bf8d033ffdcc /net/wireless | |
| parent | f5521b13880f4f4f612e1d20dd4f565122d16e04 (diff) | |
| download | linux-3.10-46a5ebaf02d69e26ee0f47a0b8d2d9bc619240d4.tar.gz linux-3.10-46a5ebaf02d69e26ee0f47a0b8d2d9bc619240d4.tar.bz2 linux-3.10-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/wireless')
| -rw-r--r-- | net/wireless/core.h | 9 | ||||
| -rw-r--r-- | net/wireless/reg.c | 6 |
2 files changed, 11 insertions, 4 deletions
diff --git a/net/wireless/core.h b/net/wireless/core.h index 58ab2c791d2..37580e090a3 100644 --- a/net/wireless/core.h +++ b/net/wireless/core.h @@ -95,7 +95,10 @@ extern struct mutex cfg80211_mutex; extern struct list_head cfg80211_rdev_list; extern int cfg80211_rdev_list_generation; -#define assert_cfg80211_lock() WARN_ON(!mutex_is_locked(&cfg80211_mutex)) +static inline void assert_cfg80211_lock(void) +{ + lockdep_assert_held(&cfg80211_mutex); +} /* * You can use this to mark a wiphy_idx as not having an associated wiphy. @@ -202,8 +205,8 @@ static inline void wdev_unlock(struct wireless_dev *wdev) mutex_unlock(&wdev->mtx); } -#define ASSERT_RDEV_LOCK(rdev) WARN_ON(!mutex_is_locked(&(rdev)->mtx)); -#define ASSERT_WDEV_LOCK(wdev) WARN_ON(!mutex_is_locked(&(wdev)->mtx)); +#define ASSERT_RDEV_LOCK(rdev) lockdep_assert_held(&(rdev)->mtx) +#define ASSERT_WDEV_LOCK(wdev) lockdep_assert_held(&(wdev)->mtx) enum cfg80211_event_type { EVENT_CONNECT_RESULT, diff --git a/net/wireless/reg.c b/net/wireless/reg.c index b0d9a08447c..d14bbf960c1 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -74,7 +74,11 @@ const struct ieee80211_regdomain *cfg80211_regdomain; * - last_request */ static DEFINE_MUTEX(reg_mutex); -#define assert_reg_lock() WARN_ON(!mutex_is_locked(®_mutex)) + +static inline void assert_reg_lock(void) +{ + lockdep_assert_held(®_mutex); +} /* Used to queue up regulatory hints */ static LIST_HEAD(reg_requests_list); |