Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3b407fb authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

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: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent cf03268e

net/wireless/core.c

+2 −4
Original line number Diff line number Diff line
@@ -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)

net/wireless/reg.c

+0 −3
Original line number Diff line number Diff line
@@ -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 */

net/wireless/reg.h

+0 −1
Original line number Diff line number Diff line 
#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);