---

yaml --- r: 134957 b: refs/heads/master c: 0bfbce1 h: refs/heads/master i: 134955: 7fef3c3 v: v3
git-mirror · Feb 27, 2009 · e73fd3f · e73fd3f
1 parent aa91dc3
commit e73fd3f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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;
-Original file line number
+Diff line change
@@ Expand Up / @@ -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));
     }
     /*
@@ Expand Down @@