From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 3 Dec 2012 16:21:26 +0000 (+0100)
Subject: regulatory: simplify regulatory_hint_11d
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=75e2dba866706ab9b133983b7fd9a6297b24c22d;p=linux-beck.git

regulatory: simplify regulatory_hint_11d

There's no need to unlock before calling
queue_regulatory_request(), so simplify
the function.

Acked-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 1496a10da638..cd99d285e8d8 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1825,12 +1825,7 @@ void regulatory_hint_11d(struct wiphy *wiphy,
 	request->initiator = NL80211_REGDOM_SET_BY_COUNTRY_IE;
 	request->country_ie_env = env;
 
-	mutex_unlock(&reg_mutex);
-
 	queue_regulatory_request(request);
-
-	return;
-
 out:
 	mutex_unlock(&reg_mutex);
 }