---

yaml --- r: 134215 b: refs/heads/master c: 5eebade h: refs/heads/master i: 134213: fb3110f 134211: c6d5745 134207: eb4d205 v: v3
git-mirror · Jan 29, 2009 · 0829728 · 0829728
1 parent a15de4b
commit 0829728
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34f573473a659f8c2727d8d408e17b241900c28e
+refs/heads/master: 5eebade608d695e30e89d4c5ca6136a58f24ed14
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
@@ -1091,6 +1091,16 @@ static int ignore_request(struct wiphy *wiphy, enum reg_set_by set_by,
 		if (last_request->initiator == REGDOM_SET_BY_USER &&
 			  last_request->intersect)
 			return -EOPNOTSUPP;
+		/* Process user requests only after previous user/driver/core
+		 * requests have been processed */
+		if (last_request->initiator == REGDOM_SET_BY_CORE ||
+		    last_request->initiator == REGDOM_SET_BY_DRIVER ||
+		    last_request->initiator == REGDOM_SET_BY_USER) {
+			if (!alpha2_equal(last_request->alpha2,
+			    cfg80211_regdomain->alpha2))
+				return -EAGAIN;
+		}
+
 		return 0;
 	}