From a81655957c4f2a6b038c9e98e65c1eddb0d39945 Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Date: Wed, 12 Nov 2008 14:21:59 -0800
Subject: [PATCH] --- yaml --- r: 122270 b: refs/heads/master c:
 a01ddafd43f7d53a65ef053eb80a4dee58839c1f h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/net/wireless/reg.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index faca3c143407..861eb8dc8abb 100644
--- 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
index 845e2d326632..f062b8b7000a 100644
--- 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;
 }