From b264fecd5288cee2289a8cb1bc0d6c24b32d206f Mon Sep 17 00:00:00 2001 From: Srinivas Dasari Date: Tue, 21 May 2019 18:56:25 +0530 Subject: [PATCH] qcacld-3.0: Read ini param oce_sta_enable after parsing the ini conf The ini param oce_sta_enable is getting read before parsing the ini conf file, to set few OCE related wiphy flags. None of these flags are getting set as it is resulting 0. Move this to an API after parsing the ini file. Change-Id: Ibf61996da4cc6b69892a5f2fe325b42c39f5fce3 CRs-Fixed: 2449519 --- core/hdd/src/wlan_hdd_cfg80211.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 3bb160ad5a60..5493683c268d 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -13402,8 +13402,6 @@ int wlan_hdd_cfg80211_init(struct device *dev, uint32_t *cipher_suites; uint8_t allow_mcc_go_diff_bi = 0, enable_mcc = 0; bool mac_spoofing_enabled; - bool is_oce_sta_enabled; - QDF_STATUS status; hdd_enter(); @@ -13442,14 +13440,6 @@ int wlan_hdd_cfg80211_init(struct device *dev, wlan_hdd_cfg80211_set_wiphy_scan_flags(wiphy); - is_oce_sta_enabled = false; - status = ucfg_mlme_get_oce_sta_enabled_info(hdd_ctx->psoc, - &is_oce_sta_enabled); - if (QDF_IS_STATUS_ERROR(status)) - hdd_err("could not get OCE STA enable info"); - if (is_oce_sta_enabled) - wlan_hdd_cfg80211_set_wiphy_oce_scan_flags(wiphy); - wlan_hdd_cfg80211_set_wiphy_sae_feature(wiphy); wlan_scan_cfg80211_add_connected_pno_support(wiphy); @@ -13764,7 +13754,7 @@ void wlan_hdd_update_wiphy(struct hdd_context *hdd_ctx) { int value; bool fils_enabled; - bool dfs_master_capable = true; + bool dfs_master_capable = true, is_oce_sta_enabled = false; QDF_STATUS status; ucfg_mlme_get_sap_max_peers(hdd_ctx->psoc, &value); @@ -13785,6 +13775,13 @@ void wlan_hdd_update_wiphy(struct hdd_context *hdd_ctx) &dfs_master_capable); if (QDF_IS_STATUS_SUCCESS(status) && dfs_master_capable) wlan_hdd_cfg80211_set_dfs_offload_feature(hdd_ctx->wiphy); + + status = ucfg_mlme_get_oce_sta_enabled_info(hdd_ctx->psoc, + &is_oce_sta_enabled); + if (QDF_IS_STATUS_ERROR(status)) + hdd_err("could not get OCE STA enable info"); + if (is_oce_sta_enabled) + wlan_hdd_cfg80211_set_wiphy_oce_scan_flags(hdd_ctx->wiphy); } /**