From 31c36fd82986af327d12eab2063edaff58b01391 Mon Sep 17 00:00:00 2001 From: Amar Singhal Date: Mon, 7 Jan 2019 16:20:54 -0800 Subject: [PATCH] qcacmn: Set world mode if dynamic country not found Currently host does not process the country code if CC is not found in the firmware. Firmware supposedly set world mode if CC is not found. Set the world mode in such a case. Change-Id: I87dde58c70ce12358583c704d1959e0467f9b186 CRs-Fixed: 2368293 --- umac/regulatory/core/src/reg_services.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/umac/regulatory/core/src/reg_services.c b/umac/regulatory/core/src/reg_services.c index 27084d21fb04..6aea3d70da34 100644 --- a/umac/regulatory/core/src/reg_services.c +++ b/umac/regulatory/core/src/reg_services.c @@ -3209,12 +3209,18 @@ QDF_STATUS reg_process_master_chan_list(struct cur_regulatory_info reg_err("pdev is NULL"); return QDF_STATUS_E_FAILURE; } - wlan_objmgr_pdev_release_ref(pdev, dbg_id); if (tx_ops->set_country_failed) tx_ops->set_country_failed(pdev); - return QDF_STATUS_E_FAILURE; + wlan_objmgr_pdev_release_ref(pdev, dbg_id); + + if (regulat_info->status_code != REG_CURRENT_ALPHA2_NOT_FOUND) + return QDF_STATUS_E_FAILURE; + + soc_reg->new_user_ctry_pending[phy_id] = false; + soc_reg->new_11d_ctry_pending[phy_id] = false; + soc_reg->world_country_pending[phy_id] = true; } mas_chan_list = soc_reg->mas_chan_params[phy_id].mas_chan_list;