Skip to content

Commit a2bff26

Browse files
Luis R. Rodriguezlinvjw
authored andcommitted
cfg80211: avoid flushing the global workqueue for core reg hints
When cfg80211 starts it will send a core regulatory hint. This is sent to the global workqueue but we force processing of it by flushing the global workqueue. The flushing was done since cfg80211 needs last_request to always be populated. Avoid flushing the global workqueue by processing the work required immediately instead of putting it into a linked list and processing it after the flush. Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
1 parent ef5127a commit a2bff26

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

net/wireless/reg.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1920,14 +1920,12 @@ static int regulatory_hint_core(const char *alpha2)
19201920
request->alpha2[1] = alpha2[1];
19211921
request->initiator = NL80211_REGDOM_SET_BY_CORE;
19221922

1923-
queue_regulatory_request(request);
1924-
19251923
/*
19261924
* This ensures last_request is populated once modules
19271925
* come swinging in and calling regulatory hints and
19281926
* wiphy_apply_custom_regulatory().
19291927
*/
1930-
flush_scheduled_work();
1928+
reg_process_hint(request);
19311929

19321930
return 0;
19331931
}

0 commit comments

Comments
 (0)