From e4d73c6be8fb52b26ae5b9d69aaad3d0ed774338 Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Fri, 17 Mar 2017 11:56:46 +0530 Subject: qcacld-3.0: Don't send reg hint during start modules after PDR After PDR driver send regulatory hint with the same country code which was already set by driver before PDR. As part of regulatory hint kernel remove the custom regulatory flag from wiphy flags and as in this case country has not changed, no reg notifier is called and thus wiphy flags are not restored by driver. Due to this if user set an country the channel flags and power are not reset and 5Ghz channels remain Passive. To fix this don't send reg hint during start modules if init_by_driver flag is set. Change-Id: I126465aa91f40df5c92da44361f414a7792e927f CRs-Fixed: 2019049 --- core/hdd/src/wlan_hdd_regulatory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/hdd/src/wlan_hdd_regulatory.c b/core/hdd/src/wlan_hdd_regulatory.c index a78806ee71ce..bcf67fa72c4b 100644 --- a/core/hdd/src/wlan_hdd_regulatory.c +++ b/core/hdd/src/wlan_hdd_regulatory.c @@ -525,7 +525,7 @@ void hdd_program_country_code(hdd_context_t *hdd_ctx) struct wiphy *wiphy = hdd_ctx->wiphy; uint8_t *country_alpha2 = hdd_ctx->reg.alpha2; - if (false == init_by_reg_core) { + if (!init_by_reg_core && !init_by_driver) { init_by_driver = true; if (('0' != country_alpha2[0]) || ('0' != country_alpha2[1])) -- cgit v1.2.3