From ffded866aed19f91d1d2c66776b3f7854221cec1 Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Date: Mon, 18 Oct 2010 17:44:51 -0700
Subject: [PATCH] --- yaml --- r: 218433 b: refs/heads/master c:
 a171fba491f54216e356efa46096171a7ed01d10 h: refs/heads/master i:   218431:
 652f7011ba1120b3b9fa61409abc6d7deb3e0d67 v: v3

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

diff --git a/[refs] b/[refs]
index 143bbb11ca74..906202b5af24 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d2f2cd066e9e2b7e43d516d92e66dac2fc46aa0
+refs/heads/master: a171fba491f54216e356efa46096171a7ed01d10
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
index d14bbf960c18..4b9f8912526c 100644
--- a/trunk/net/wireless/reg.c
+++ b/trunk/net/wireless/reg.c
@@ -1167,7 +1167,7 @@ static int ignore_request(struct wiphy *wiphy,
 				return 0;
 			return -EALREADY;
 		}
-		return REG_INTERSECT;
+		return 0;
 	case NL80211_REGDOM_SET_BY_DRIVER:
 		if (last_request->initiator == NL80211_REGDOM_SET_BY_CORE) {
 			if (regdom_changes(pending_request->alpha2))