diff --git a/[refs] b/[refs] index 178728fdcdb2..8a6926629171 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef5127a4d256b9c0f47caae6cdc8ccfceedb09f9 +refs/heads/master: a2bff2694b02448e1d5873ac010582bc9898021c diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c index 5f8071de7950..5dcda28b6f04 100644 --- a/trunk/net/wireless/reg.c +++ b/trunk/net/wireless/reg.c @@ -1920,14 +1920,12 @@ static int regulatory_hint_core(const char *alpha2) request->alpha2[1] = alpha2[1]; request->initiator = NL80211_REGDOM_SET_BY_CORE; - queue_regulatory_request(request); - /* * This ensures last_request is populated once modules * come swinging in and calling regulatory hints and * wiphy_apply_custom_regulatory(). */ - flush_scheduled_work(); + reg_process_hint(request); return 0; }