From 05664c4ea9a58a4f94fa935b2d6d8d621b8b8b03 Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Date: Fri, 29 Jan 2010 19:58:56 -0500
Subject: [PATCH] --- yaml --- r: 183942 b: refs/heads/master c:
 a2bff2694b02448e1d5873ac010582bc9898021c h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 178728fdcdb2..8a6926629171 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef5127a4d256b9c0f47caae6cdc8ccfceedb09f9
+refs/heads/master: a2bff2694b02448e1d5873ac010582bc9898021c
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
index 5f8071de7950..5dcda28b6f04 100644
--- a/trunk/net/wireless/reg.c
+++ b/trunk/net/wireless/reg.c
@@ -1920,14 +1920,12 @@ static int regulatory_hint_core(const char *alpha2)
 	request->alpha2[1] = alpha2[1];
 	request->initiator = NL80211_REGDOM_SET_BY_CORE;
 
-	queue_regulatory_request(request);
-
 	/*
 	 * This ensures last_request is populated once modules
 	 * come swinging in and calling regulatory hints and
 	 * wiphy_apply_custom_regulatory().
 	 */
-	flush_scheduled_work();
+	reg_process_hint(request);
 
 	return 0;
 }