summaryrefslogtreecommitdiffstats
path: root/net/mac80211/sta_info.c
diff options
context:
space:
mode:
authorJohannes Berg2010-09-15 13:28:15 +0200
committerJohn W. Linville2010-09-16 21:46:00 +0200
commit46a5ebaf02d69e26ee0f47a0b8d2d9bc619240d4 (patch)
tree77bc5ceee61ce125c4b608d7b979bf8d033ffdcc /net/mac80211/sta_info.c
parentmac80211: use correct station flags lock (diff)
downloadkernel-qcow2-linux-46a5ebaf02d69e26ee0f47a0b8d2d9bc619240d4.tar.gz
kernel-qcow2-linux-46a5ebaf02d69e26ee0f47a0b8d2d9bc619240d4.tar.xz
kernel-qcow2-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/sta_info.c')
-rw-r--r--net/mac80211/sta_info.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index e356ff80671a..44e10a9de0a7 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -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)