summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkaliu <kaliu@qti.qualcomm.com>2016-08-11 10:59:01 +0800
committerAnjaneedevi Kapparapu <akappa@codeaurora.org>2016-08-12 18:21:27 +0530
commit85db2178931e734ff5fe7a50b6247f4e2643ea9a (patch)
tree5bc6381240d81fb6eda1cef361e11b2052e95336
parent9b2f2d1b1156f5a9088ad3332f50e3ba80426f00 (diff)
qcacld-2.0: Fix type mismatch between retrun value and function definition
Return value type of routine roamRoamConnectStatusUpdateHandler and hdd_hostapd_SAPEventCB mismatch with the one in function definition. Fix the mismatch. Change-Id: I0e98a73a6be97d6bd62ae9026d4c62ae19fe88f9 CRs-Fixed: 1053160
-rw-r--r--CORE/HDD/src/wlan_hdd_assoc.c2
-rw-r--r--CORE/HDD/src/wlan_hdd_hostapd.c10
2 files changed, 6 insertions, 6 deletions
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index c5947c249261..030d88407803 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -2882,7 +2882,7 @@ static eHalStatus roamRoamConnectStatusUpdateHandler( hdd_adapter_t *pAdapter, t
hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: sme_RoamSetKey failed, returned %d",
__func__, vosStatus);
- return VOS_STATUS_E_FAILURE;
+ return eHAL_STATUS_FAILURE;
}
}
hddLog(LOG1, FL("Enabling queues"));
diff --git a/CORE/HDD/src/wlan_hdd_hostapd.c b/CORE/HDD/src/wlan_hdd_hostapd.c
index 1b7c1c705712..d7ee674b5b40 100644
--- a/CORE/HDD/src/wlan_hdd_hostapd.c
+++ b/CORE/HDD/src/wlan_hdd_hostapd.c
@@ -1322,7 +1322,7 @@ VOS_STATUS hdd_hostapd_SAPEventCB( tpSap_Event pSapEvent, v_PVOID_t usrDataForCa
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
"%s: usrDataForCallback is null", __func__);
- return eHAL_STATUS_FAILURE;
+ return VOS_STATUS_E_FAILURE;
}
pHostapdAdapter = netdev_priv(dev);
@@ -1332,7 +1332,7 @@ VOS_STATUS hdd_hostapd_SAPEventCB( tpSap_Event pSapEvent, v_PVOID_t usrDataForCa
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
"invalid adapter or adapter has invalid magic");
- return eHAL_STATUS_FAILURE;
+ return VOS_STATUS_E_FAILURE;
}
pHostapdState = WLAN_HDD_GET_HOSTAP_STATE_PTR(pHostapdAdapter);
@@ -1342,7 +1342,7 @@ VOS_STATUS hdd_hostapd_SAPEventCB( tpSap_Event pSapEvent, v_PVOID_t usrDataForCa
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
"%s: pSapEvent is null", __func__);
- return eHAL_STATUS_FAILURE;
+ return VOS_STATUS_E_FAILURE;
}
sapEvent = pSapEvent->sapHddEventCode;
@@ -1351,14 +1351,14 @@ VOS_STATUS hdd_hostapd_SAPEventCB( tpSap_Event pSapEvent, v_PVOID_t usrDataForCa
if (!pHddCtx) {
hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is null"));
- return eHAL_STATUS_FAILURE;
+ return VOS_STATUS_E_FAILURE;
}
cfg = pHddCtx->cfg_ini;
if (!cfg) {
hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD config is null"));
- return eHAL_STATUS_FAILURE;
+ return VOS_STATUS_E_FAILURE;
}
dfs_info.channel = pHddApCtx->operatingChannel;