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
这个提交包含在:
@@ -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,
|
sme_cli_set_command(0, (int)WMI_PDEV_PARAM_ABG_MODE_TX_CHAIN_NUM,
|
||||||
num_abg_tx_chains, PDEV_CMD);
|
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);
|
ret = hdd_pre_enable_configure(hdd_ctx);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
hdd_err("Failed to pre-configure cds");
|
hdd_err("Failed to pre-configure cds");
|
||||||
|
@@ -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);
|
sme_set_cc_src(hdd_ctx->mac_handle, cc_src);
|
||||||
} else {
|
} else {
|
||||||
hdd_ctx->reg_offload = false;
|
hdd_ctx->reg_offload = false;
|
||||||
ucfg_reg_program_default_cc(hdd_ctx->pdev,
|
|
||||||
hdd_ctx->reg.reg_domain);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
在新工单中引用
屏蔽一个用户