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 5031db7b275b734b46870089765420c75c136d10..72825afe2bf638d100fc1fe63c8968c5717bdba3 100644 (file)
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -301,12 +301,10 @@ int wiphy_register(struct wiphy *wiphy)
        /* check and set up bitrates */
        ieee80211_set_bitrate_flags(wiphy);
 
+       mutex_lock(&cfg80211_drv_mutex);
+
        /* 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);
 
        res = device_add(&drv->wiphy.dev);
        if (res)

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 626dbb688499bd9dafa0b963305df65d3ac0c04a..581273d868448b409cbee543f490c5d066d7bfe2 100644 (file)
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -52,7 +52,6 @@ struct regulatory_request {
 };
 
 static LIST_HEAD(regulatory_requests);
-DEFINE_MUTEX(cfg80211_reg_mutex);
 
 /* To trigger userspace events */
 static struct platform_device *reg_pdev;
@@ -63,8 +62,6 @@ static u32 supported_bandwidths[] = {
        MHZ_TO_KHZ(20),
 };
 
-static struct list_head regulatory_requests;
-
 /* Central wireless core regulatory domains, we only need two,
  * the current one and a world regulatory domain in case we have no
  * information to give us an alpha2 */

diff --git a/net/wireless/reg.h b/net/wireless/reg.h
index a4845b140a8436fb86ea4718705c2468d6092ac7..0c1572b92fef2b422ee9ded169edd84dc36a26e6 100644 (file)
--- a/net/wireless/reg.h
+++ b/net/wireless/reg.h
@@ -1,7 +1,6 @@
 #ifndef __NET_WIRELESS_REG_H
 #define __NET_WIRELESS_REG_H
 
-extern struct mutex cfg80211_reg_mutex;
 bool is_world_regdom(const char *alpha2);
 bool reg_is_valid_request(const char *alpha2);