From 77fefb8ec38e371c21479eb39841de5c4d36aa1b Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>
Date: Mon, 28 Nov 2011 16:47:16 -0500
Subject: [PATCH] --- yaml --- r: 276429 b: refs/heads/master c:
 0bac71af6e66dc798bf07d0c0dd14ee5503362f9 h: refs/heads/master i:   276427:
 e3605f76f47be82ae0ebd4b50b852035b7b2e513 v: v3

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

diff --git a/[refs] b/[refs]
index cabab314ab19..e588a593729e 100644
--- 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
index 0ec40715a67b..074c1122ce42 100644
--- 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;
 	}