---

yaml --- r: 150817 b: refs/heads/master c: 558f6d3 h: refs/heads/master i: 150815: b794079 v: v3
git-mirror · Jun 10, 2009 · 7d72fcc · 7d72fcc
1 parent d913d22
commit 7d72fcc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 403a3a136122457165321e90b7569a321cc9ac12
+refs/heads/master: 558f6d3229ddb9f11ca4ffee0439046c283882ff
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
@@ -2129,7 +2129,12 @@ static int __set_regdom(const struct ieee80211_regdomain *rd)
 		 * driver wanted to the wiphy to deal with conflicts
 		 */
 
-		BUG_ON(request_wiphy->regd);
+		/*
+		 * Userspace could have sent two replies with only
+		 * one kernel request.
+		 */
+		if (request_wiphy->regd)
+			return -EALREADY;
 
 		r = reg_copy_regd(&request_wiphy->regd, rd);
 		if (r)