lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Use default value of ini items if not initialized

Browse Source 
If FW offload cfg object is not initialized before invoking
the ucfg APIs use the cfg defaults for the values.

Change-Id: Ibbfe22a833ab217f670058e504ec80971c98e049
CRs-fixed: 2376983
This commit is contained in:
Manikandan Mohan 2019-01-07 16:57:03 -08:00 committed by nshrivas
parent 7152a355fa
commit 5dba1c70c3
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/fw_offload/dispatcher/src/wlan_fwol_ucfg_api.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2018 The Linux Foundation. All rights reserved.
* Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
@ -534,6 +534,7 @@ QDF_STATUS ucfg_fwol_get_tsf_gpio_pin(struct wlan_objmgr_psoc *psoc,
fwol_obj = fwol_get_psoc_obj(psoc);
if (!fwol_obj) {
fwol_err("Failed to get FWOL obj");
*tsf_gpio_pin = cfg_default(CFG_SET_TSF_GPIO_PIN);
return QDF_STATUS_E_FAILURE;
}
@ -550,6 +551,7 @@ QDF_STATUS ucfg_fwol_get_tsf_ptp_options(struct wlan_objmgr_psoc *psoc,
fwol_obj = fwol_get_psoc_obj(psoc);
if (!fwol_obj) {
fwol_err("Failed to get FWOL obj");
*tsf_ptp_options = cfg_default(CFG_SET_TSF_PTP_OPT);
return QDF_STATUS_E_FAILURE;
}
@ -579,6 +581,7 @@ QDF_STATUS ucfg_fwol_get_lprx_enable(struct wlan_objmgr_psoc *psoc,
fwol_obj = fwol_get_psoc_obj(psoc);
if (!fwol_obj) {
fwol_err("Failed to get FWOL obj");
*lprx_enable = cfg_default(CFG_LPRX);
return QDF_STATUS_E_FAILURE;
}
@ -595,6 +598,7 @@ QDF_STATUS ucfg_fwol_get_sae_enable(struct wlan_objmgr_psoc *psoc,
fwol_obj = fwol_get_psoc_obj(psoc);
if (!fwol_obj) {
fwol_err("Failed to get FWOL obj");
*sae_enable = cfg_default(CFG_IS_SAE_ENABLED);
return QDF_STATUS_E_FAILURE;
}
@ -617,6 +621,7 @@ QDF_STATUS ucfg_fwol_get_gcmp_enable(struct wlan_objmgr_psoc *psoc,
fwol_obj = fwol_get_psoc_obj(psoc);
if (!fwol_obj) {
fwol_err("Failed to get FWOL obj");
*gcmp_enable = cfg_default(CFG_ENABLE_GCMP);
return QDF_STATUS_E_FAILURE;
}
@ -632,6 +637,7 @@ QDF_STATUS ucfg_fwol_get_enable_tx_sch_delay(struct wlan_objmgr_psoc *psoc,
fwol_obj = fwol_get_psoc_obj(psoc);
if (!fwol_obj) {
fwol_err("Failed to get FWOL obj");
*enable_tx_sch_delay = cfg_default(CFG_TX_SCH_DELAY);
return QDF_STATUS_E_FAILURE;
}
@ -647,6 +653,7 @@ QDF_STATUS ucfg_fwol_get_enable_secondary_rate(struct wlan_objmgr_psoc *psoc,
fwol_obj = fwol_get_psoc_obj(psoc);
if (!fwol_obj) {
fwol_err("Failed to get FWOL obj");
*enable_secondary_rate = cfg_default(CFG_ENABLE_SECONDARY_RATE);
return QDF_STATUS_E_FAILURE;
}

8
core/hdd/src/wlan_hdd_cfg80211.c
View File

@ -12627,11 +12627,9 @@ static void wlan_hdd_cfg80211_set_wiphy_sae_feature(struct wiphy *wiphy,
struct hdd_context *hdd_ctx = wiphy_priv(wiphy);
bool sae_enable;
if (QDF_IS_STATUS_SUCCESS(ucfg_fwol_get_sae_enable(
hdd_ctx->psoc, &sae_enable))) {
if (sae_enable)
wiphy->features |= NL80211_FEATURE_SAE;
}
ucfg_fwol_get_sae_enable(hdd_ctx->psoc, &sae_enable);
if (sae_enable)
wiphy->features |= NL80211_FEATURE_SAE;
}
#else
static void wlan_hdd_cfg80211_set_wiphy_sae_feature(struct wiphy *wiphy,