From 02526cd6ce5fd6ad9e9a0586c2c0451b1e298c6c Mon Sep 17 00:00:00 2001 From: Paul Zhang Date: Thu, 20 Sep 2018 17:47:46 +0800 Subject: [PATCH] qcacld-3.0: Adjust calling ucfg_reg_program_default_cc With commit I4ec1268eb491fec04a78b90e51c6e616d95e019e, the function wlan_reg_get_channel_list_with_power sets num20MHzChannelsFound to 0 because the current channel list has not initialized yet for regulatory non-offload case. Change-Id: I6a055534f2b9a763a8cbba8fef3062ed6ea424cd CRs-Fixed: 2319332 --- core/hdd/src/wlan_hdd_main.c | 4 ++++ core/hdd/src/wlan_hdd_regulatory.c | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 9bcc5acd9d..77e0ec28b1 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -10981,6 +10981,10 @@ int hdd_configure_cds(struct hdd_context *hdd_ctx) sme_cli_set_command(0, (int)WMI_PDEV_PARAM_ABG_MODE_TX_CHAIN_NUM, num_abg_tx_chains, PDEV_CMD); + if (!ucfg_reg_is_regdb_offloaded(hdd_ctx->psoc)) + ucfg_reg_program_default_cc(hdd_ctx->pdev, + hdd_ctx->reg.reg_domain); + ret = hdd_pre_enable_configure(hdd_ctx); if (ret) { hdd_err("Failed to pre-configure cds"); diff --git a/core/hdd/src/wlan_hdd_regulatory.c b/core/hdd/src/wlan_hdd_regulatory.c index b60a1b5ff4..7170fbfceb 100644 --- a/core/hdd/src/wlan_hdd_regulatory.c +++ b/core/hdd/src/wlan_hdd_regulatory.c @@ -1393,8 +1393,6 @@ int hdd_regulatory_init(struct hdd_context *hdd_ctx, struct wiphy *wiphy) sme_set_cc_src(hdd_ctx->mac_handle, cc_src); } else { hdd_ctx->reg_offload = false; - ucfg_reg_program_default_cc(hdd_ctx->pdev, - hdd_ctx->reg.reg_domain); } return 0;