summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmar Singhal <asinghal@qca.qualcomm.com>2015-04-29 13:32:57 -0700
committerAnjaneeDevi Kapparapu <c_akappa@qti.qualcomm.com>2015-05-04 23:39:25 +0530
commite8f61de1facfe7f31f2e352a87dbc446f85d7fdf (patch)
treed9bfea201153449df0e3592436f724d88540f134
parente49dda9f1da7da1f2e8d0916599bb63e08ddf6f0 (diff)
qcacld-2.0 : Correct issues in wifi config
Correct coding issues in wifi configuration Change-Id: Ia04fbcd6954264984f81362948546c84af9cf05a CRs-Fixed: 810050
-rw-r--r--CORE/HDD/src/wlan_hdd_cfg80211.c3
-rw-r--r--CORE/SERVICES/COMMON/wma_api.h2
-rw-r--r--CORE/SERVICES/WMA/wma.c2
-rw-r--r--CORE/SME/src/sme_common/sme_Api.c6
4 files changed, 7 insertions, 6 deletions
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index e2ccf9bedbab..4b39f458a908 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -6807,7 +6807,8 @@ static int wlan_hdd_cfg80211_wifi_configuration_set(struct wiphy *wiphy,
u32 guard_time;
eHalStatus status;
- if ((ret_val = wlan_hdd_validate_context(pHddCtx))) {
+ ret_val = wlan_hdd_validate_context(pHddCtx);
+ if (!ret_val) {
hddLog(LOGE, FL("HDD context is not valid"));
return ret_val;
}
diff --git a/CORE/SERVICES/COMMON/wma_api.h b/CORE/SERVICES/COMMON/wma_api.h
index 9db03444432f..f4812bfcc2d4 100644
--- a/CORE/SERVICES/COMMON/wma_api.h
+++ b/CORE/SERVICES/COMMON/wma_api.h
@@ -74,7 +74,7 @@ typedef enum {
GEN_PARAM_DUMP_WATCHDOG,
GEN_PARAM_CRASH_INJECT,
#ifdef CONFIG_ATH_PCIE_ACCESS_DEBUG
- GEN_PARAM_DUMP_PCIE_ACCESS_LOG
+ GEN_PARAM_DUMP_PCIE_ACCESS_LOG,
#endif
GEN_PARAM_MODULATED_DTIM,
GEN_PARAM_CAPTURE_TSF,
diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c
index 69b5176707ad..6f24b2bb7082 100644
--- a/CORE/SERVICES/WMA/wma.c
+++ b/CORE/SERVICES/WMA/wma.c
@@ -3706,7 +3706,7 @@ static int wma_unified_link_iface_stats_event_handler(void *handle,
"rssi_mgmt %u rssi_data %u rssi_ack %u num_peers %u "
"num_peer_events %u num_ac %u roam_state %u"
" avg_bcn_spread_offset_high %u"
- " avg_bcn_spread_offset_high %u"
+ " avg_bcn_spread_offset_low %u"
" is leaky_ap %u"
" avg_rx_frames_leaked %u"
" rx_leak_window %u",
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 6e1dcbf4f8bd..cd1ca160f9c0 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -16000,7 +16000,7 @@ bool sme_validate_sap_channel_switch(tHalHandle hal,
* @session_id: session ID
* @stats_avg_factor: average stats factor
*
- * This function configures the guard time in firmware
+ * This function configures the avg stats factor in firmware
*
* Return: eHalStatus
*/
@@ -16069,11 +16069,11 @@ eHalStatus sme_configure_guard_time(tHalHandle hHal, tANI_U8 session_id,
tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
struct sir_guard_time_request *g_time;
- g_time = vos_mem_malloc(sizeof(g_time));
+ g_time = vos_mem_malloc(sizeof(*g_time));
if (!g_time) {
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
- "%s: Not able to allocate memory for WDA_SET_MDNS_RESPONSE_CMD",
+ "%s: Not able to allocate memory for SIR_HAL_CONFIG_GUARD_TIME",
__func__);
return eHAL_STATUS_E_MALLOC_FAILED;
}