diff --git a/[refs] b/[refs]
index c847d1164d55..9c0eb52f6335 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 222d0b33b3778a8fa156f3fca284d0a71f8e966b
+refs/heads/master: 0bfbce18b9c11201ebf1cfbc0deeab7bdbfe32a5
diff --git a/trunk/net/wireless/core.h b/trunk/net/wireless/core.h
index cd8e6e3ef116..f6c53f5807f4 100644
--- a/trunk/net/wireless/core.h
+++ b/trunk/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/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c
index 97f69bed3fe2..531bb67cf502 100644
--- a/trunk/net/wireless/nl80211.c
+++ b/trunk/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;