summaryrefslogtreecommitdiffstats
path: root/net/wireless/core.h
diff options
context:
space:
mode:
authorJouni Malinen <jouni.malinen@atheros.com>2009-02-24 15:49:58 +0100
committerJohn W. Linville <linville@tuxdriver.com>2009-02-27 20:53:04 +0100
commit0bfbce18b9c11201ebf1cfbc0deeab7bdbfe32a5 (patch)
tree71e4bbfbf415dd5f5131a69fc8cd9ad2a0bd3edc /net/wireless/core.h
parentath9k: Unlock sc->mutex on error path (diff)
downloadlinux-0bfbce18b9c11201ebf1cfbc0deeab7bdbfe32a5.tar.xz
linux-0bfbce18b9c11201ebf1cfbc0deeab7bdbfe32a5.zip
nl80211: Avoid AP mode BUG_ON hang with invalid lock assert
"cfg80211: add assert_cfg80211_lock() to ensure proper protection" added assert_cfg80211_lock() calls into various places. At least one of them, nl80211_send_wiphy(), should not have been there. That triggers the BUG_ON in assert_cfg80211_lock() and pretty much kills the kernel whenever someone runs hostapd.. Remove that call and make assert_cfg80211_lock() use WARN_ON instead of BUG_ON to be a bit more friendly to users. Signed-off-by: Jouni Malinen <jouni.malinen@atheros.com> Acked-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/core.h')
-rw-r--r--net/wireless/core.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/core.h b/net/wireless/core.h
index cd8e6e3ef116..f6c53f5807f4 100644
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -76,7 +76,7 @@ extern struct list_head cfg80211_drv_list;
static inline void assert_cfg80211_lock(void)
{
- BUG_ON(!mutex_is_locked(&cfg80211_mutex));
+ WARN_ON(!mutex_is_locked(&cfg80211_mutex));
}
/*