aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJouni Malinen <jouni.malinen@atheros.com>2009-02-24 16:49:58 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-02-27 14:53:04 -0500
commit0bfbce18b9c11201ebf1cfbc0deeab7bdbfe32a5 (patch)
tree71e4bbfbf415dd5f5131a69fc8cd9ad2a0bd3edc
parent222d0b33b3778a8fa156f3fca284d0a71f8e966b (diff)
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>
-rw-r--r--net/wireless/core.h2
-rw-r--r--net/wireless/nl80211.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/net/wireless/core.h b/net/wireless/core.h
index cd8e6e3ef11..f6c53f5807f 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));
}
/*
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 97f69bed3fe..531bb67cf50 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -137,8 +137,6 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags,
int i;
u16 ifmodes = dev->wiphy.interface_modes;
- assert_cfg80211_lock();
-
hdr = nl80211hdr_put(msg, pid, seq, flags, NL80211_CMD_NEW_WIPHY);
if (!hdr)
return -1;