From f497ab7819d4c5f9061d7ed28186be68f311a0ba Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 3 Dec 2012 18:56:41 +0100
Subject: [PATCH] --- yaml --- r: 351735 b: refs/heads/master c:
 11cff96c0660e1e361d60ab90514ffbbfbaf7c03 h: refs/heads/master i:   351733:
 96366a57e14319e34277f2d9d1bba0c25dec4bb8   351731:
 06d482e81e0bc7e1877908d1069056197ad02a63   351727:
 ebcbe78d464b971842c75855a9239a83b7fb9bb9 v: v3

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

diff --git a/[refs] b/[refs]
index ed522777182d..62875cf228aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fdc9d7b2863ce67f51ed64f89e5b20f3077be569
+refs/heads/master: 11cff96c0660e1e361d60ab90514ffbbfbaf7c03
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
index 57812dfc297b..87daba95639c 100644
--- a/trunk/net/wireless/reg.c
+++ b/trunk/net/wireless/reg.c
@@ -1878,9 +1878,6 @@ static void restore_regulatory_settings(bool reset_user)
 			restore_custom_reg_settings(&rdev->wiphy);
 	}
 
-	mutex_unlock(&reg_mutex);
-	mutex_unlock(&cfg80211_mutex);
-
 	regulatory_hint_core(world_alpha2);
 
 	/*
@@ -1891,18 +1888,8 @@ static void restore_regulatory_settings(bool reset_user)
 	if (is_an_alpha2(alpha2))
 		regulatory_hint_user(user_alpha2, NL80211_USER_REG_HINT_USER);
 
-	if (list_empty(&tmp_reg_req_list))
-		return;
-
-	mutex_lock(&cfg80211_mutex);
-	mutex_lock(&reg_mutex);
-
 	spin_lock(&reg_requests_lock);
-	list_for_each_entry_safe(reg_request, tmp, &tmp_reg_req_list, list) {
-		REG_DBG_PRINT("Adding request for country %c%c back into the queue\n",
-			      reg_request->alpha2[0], reg_request->alpha2[1]);
-		list_move_tail(&reg_request->list, &reg_requests_list);
-	}
+	list_splice_tail_init(&tmp_reg_req_list, &reg_requests_list);
 	spin_unlock(&reg_requests_lock);
 
 	mutex_unlock(&reg_mutex);