---

yaml --- r: 276429 b: refs/heads/master c: 0bac71a h: refs/heads/master i: 276427: e3605f7 v: v3
git-mirror · Nov 30, 2011 · 77fefb8 · 77fefb8
1 parent 737bc66
commit 77fefb8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a042994dd377d86bff9446ee76151ceb6267c9ba
+refs/heads/master: 0bac71af6e66dc798bf07d0c0dd14ee5503362f9
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
@@ -2049,8 +2049,10 @@ static int __set_regdom(const struct ieee80211_regdomain *rd)
 	}
 
 	request_wiphy = wiphy_idx_to_wiphy(last_request->wiphy_idx);
-	if (!request_wiphy) {
-		reg_set_request_processed();
+	if (!request_wiphy &&
+	    (last_request->initiator == NL80211_REGDOM_SET_BY_DRIVER ||
+	     last_request->initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE)) {
+		schedule_delayed_work(&reg_timeout, 0);
 		return -ENODEV;
 	}