From 81273a5115aa71b26f88bf0922f00c1fe92f98ca Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Date: Thu, 22 Jan 2009 15:05:54 -0800
Subject: [PATCH] --- yaml --- r: 134222 b: refs/heads/master c:
 24ed1da1337b92e3b0a89f2c2b7cd33b9a8fcb62 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 52e75a406926..1b2e462b16f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a95371aa26e3cb9fb1340362912000088ff3c3e
+refs/heads/master: 24ed1da1337b92e3b0a89f2c2b7cd33b9a8fcb62
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
index 89e0d8b3cf1e..af9132cea931 100644
--- a/trunk/net/wireless/reg.c
+++ b/trunk/net/wireless/reg.c
@@ -764,8 +764,9 @@ static int freq_reg_info_regd(struct wiphy *wiphy,
 	regd = custom_regd ? custom_regd : cfg80211_regdomain;
 
 	/* Follow the driver's regulatory domain, if present, unless a country
-	 * IE has been processed */
+	 * IE has been processed or a user wants to help complaince further */
 	if (last_request->initiator != REGDOM_SET_BY_COUNTRY_IE &&
+	    last_request->initiator != REGDOM_SET_BY_USER &&
 	    wiphy->regd)
 		regd = wiphy->regd;