wireless: remove cfg80211_reg_mutex
This mutex is wrong, we use cfg80211_drv_mutex (which should
possibly be renamed to just cfg80211_mutex) everywhere except
in one place, fix that and get rid of the extra mutex.
Also get rid of a spurious regulatory_requests list definition.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
diff --git a/net/wireless/core.c b/net/wireless/core.c
index 5031db7..72825af 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -301,13 +301,11 @@
/* check and set up bitrates */
ieee80211_set_bitrate_flags(wiphy);
- /* set up regulatory info */
- mutex_lock(&cfg80211_reg_mutex);
- wiphy_update_regulatory(wiphy, REGDOM_SET_BY_CORE);
- mutex_unlock(&cfg80211_reg_mutex);
-
mutex_lock(&cfg80211_drv_mutex);
+ /* set up regulatory info */
+ wiphy_update_regulatory(wiphy, REGDOM_SET_BY_CORE);
+
res = device_add(&drv->wiphy.dev);
if (res)
goto out_unlock;