diff options
| author | Yingying Tang <yintang@qti.qualcomm.com> | 2016-03-04 17:28:17 +0800 |
|---|---|---|
| committer | Anjaneedevi Kapparapu <akappa@codeaurora.org> | 2016-03-24 13:35:25 +0530 |
| commit | ff1ec478293cab47890138a0f2441aa6676ff8f5 (patch) | |
| tree | 186727b746907af2f9826703c0934cc708618e7a | |
| parent | bff6cac99fff784f226e8d22c61bbe01566b7d72 (diff) | |
qcacld-2.0: Fix improper type casting and return status
In rrmProcessBeaconReportReq(), the return value is not the same
enum type with the routine definition. In dfs_process_radarevent(),
2 variables type are not same in a comparison. Add fix to correct
it.
Change-Id: Ibc5fbf70e2632a22971f33b769b31737a40123e7
CRs-Fixed: 979671
| -rw-r--r-- | CORE/MAC/src/pe/rrm/rrmApi.c | 5 | ||||
| -rw-r--r-- | CORE/SERVICES/DFS/src/dfs_process_radarevent.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/CORE/MAC/src/pe/rrm/rrmApi.c b/CORE/MAC/src/pe/rrm/rrmApi.c index bedb4d1fe831..3fb65c45c292 100644 --- a/CORE/MAC/src/pe/rrm/rrmApi.c +++ b/CORE/MAC/src/pe/rrm/rrmApi.c @@ -644,7 +644,10 @@ rrmProcessBeaconReportReq( tpAniSirGlobal pMac, mmhMsg.bodyptr = pSmeBcnReportReq; MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, pSessionEntry->peSessionId, mmhMsg.type)); - return limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT); + if (eSIR_SUCCESS != limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT)) + return eRRM_FAILURE; + + return eRRM_SUCCESS; } // -------------------------------------------------------------------- diff --git a/CORE/SERVICES/DFS/src/dfs_process_radarevent.c b/CORE/SERVICES/DFS/src/dfs_process_radarevent.c index cf20273a2c76..156a229dd0cd 100644 --- a/CORE/SERVICES/DFS/src/dfs_process_radarevent.c +++ b/CORE/SERVICES/DFS/src/dfs_process_radarevent.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2002-2014, 2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -591,7 +591,7 @@ dfs_process_radarevent(struct ath_dfs *dfs, struct ieee80211_channel *chan) This is normally 2 but can be higher for W53. */ - if ( (deltaT > (dfs->dfs_pri_multiplier * rf->rf_maxpri) ) || (deltaT < rf->rf_minpri) ) { + if ( (deltaT > ((u_int64_t)dfs->dfs_pri_multiplier * rf->rf_maxpri) ) || (deltaT < rf->rf_minpri) ) { DFS_DPRINTK(dfs, ATH_DEBUG_DFS2, "filterID %d : Rejecting on individual filter max PRI deltaT=%lld rf->rf_minpri=%u", rf->rf_pulseid, (unsigned long long)deltaT, rf->rf_minpri); |