diff options
author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2010-11-17 21:46:06 -0800 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-11-22 15:48:50 -0500 |
commit | 31e99729ae66d8b74316547c40eed15172f14ea8 (patch) | |
tree | 67f88887c561e2e68bcfc72322a46340a92deb42 /net | |
parent | 8ce469999552b0c3325350cd9b4be417f2bbfc23 (diff) | |
download | linux-3.10-31e99729ae66d8b74316547c40eed15172f14ea8.tar.gz linux-3.10-31e99729ae66d8b74316547c40eed15172f14ea8.tar.bz2 linux-3.10-31e99729ae66d8b74316547c40eed15172f14ea8.zip |
cfg80211: put core regulatory request into queue
This will simplify the synchronization for pending requests.
Without this we have a race between the core and when we
restore regulatory settings, although this is unlikely
its best to just avoid that race altogether.
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Tested-by: Mark Mentovai <mark@moxienet.com>
Tested-by: Bruno Randolf <br1@einfach.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/wireless/reg.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 3be18d9a944..9830db61019 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -1530,12 +1530,7 @@ static int regulatory_hint_core(const char *alpha2) request->alpha2[1] = alpha2[1]; request->initiator = NL80211_REGDOM_SET_BY_CORE; - /* - * This ensures last_request is populated once modules - * come swinging in and calling regulatory hints and - * wiphy_apply_custom_regulatory(). - */ - reg_process_hint(request); + queue_regulatory_request(request); return 0; } |