From: Luis R. Rodriguez Date: Thu, 18 Nov 2010 05:46:06 +0000 (-0800) Subject: cfg80211: put core regulatory request into queue X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=31e99729ae66d8b74316547c40eed15172f14ea8;p=linux-beck.git 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 Tested-by: Mark Mentovai Tested-by: Bruno Randolf Signed-off-by: John W. Linville --- diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 3be18d9a944f..9830db61019e 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; }