---

yaml --- r: 122270 b: refs/heads/master c: a01ddaf h: refs/heads/master v: v3
git-mirror · Nov 25, 2008 · a816559 · a816559
1 parent 14ab80b
commit a816559
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8295acdc323e6e383ec822fc1e95edeb9148513
+refs/heads/master: a01ddafd43f7d53a65ef053eb80a4dee58839c1f
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
@@ -880,12 +880,13 @@ int set_regdom(const struct ieee80211_regdomain *rd)
 	}
 
 	/* This would make this whole thing pointless */
-	BUG_ON(rd != cfg80211_regdomain);
+	if (!last_request->intersect)
+		BUG_ON(rd != cfg80211_regdomain);
 
 	/* update all wiphys now with the new established regulatory domain */
 	update_all_wiphy_regulatory(last_request->initiator);
 
-	print_regdomain(rd);
+	print_regdomain(cfg80211_regdomain);
 
 	return r;
 }