diff options
| author |   Johannes Berg <johannes@sipsolutions.net> | 2008-10-21 09:57:41 +0200 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2008-10-31 19:00:42 -0400 |
| commit | f3b407fba52e1b86ca286ee7c218a4fb00bd29e0 (patch) | |
| tree | df5c4fce124d0792e4a52aa269f42cb734cefb12 /net/wireless/core.c | |
| parent | wireless: don't publish __regulatory_hint (diff) | |
| download | linux-dev-f3b407fba52e1b86ca286ee7c218a4fb00bd29e0.tar.xz linux-dev-f3b407fba52e1b86ca286ee7c218a4fb00bd29e0.zip | |
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>
Diffstat (limited to 'net/wireless/core.c')
| -rw-r--r-- | net/wireless/core.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index 5031db7b275b..72825afe2bf6 100644 --- 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) |