---

yaml --- r: 134222 b: refs/heads/master c: 24ed1da h: refs/heads/master v: v3
git-mirror · Jan 29, 2009 · 81273a5 · 81273a5
1 parent e3b13a8
commit 81273a5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;