diff options
| author | Yingying Tang <yintang@codeaurora.org> | 2016-09-29 14:32:30 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-18 16:48:12 -0800 |
| commit | 7020d2af7d99ae6b5c14555004e516ff63bd8bd9 (patch) | |
| tree | 0ae59b9679d592144edcbb56a0c339c5b7571b46 | |
| parent | 3f6d6464e39a67d7af1c8d20427f3be21905d741 (diff) | |
qcacld-3.0: Fix improper type casting and return status
Propagate from qcacld-2.0 to qcacld-3.0
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/rrm_api.c | 4 | ||||
| -rw-r--r-- | core/sap/dfs/src/dfs_process_radarevent.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/core/mac/src/pe/rrm/rrm_api.c b/core/mac/src/pe/rrm/rrm_api.c index c1a282e78946..131238eb0c40 100644 --- a/core/mac/src/pe/rrm/rrm_api.c +++ b/core/mac/src/pe/rrm/rrm_api.c @@ -696,7 +696,9 @@ rrm_process_beacon_report_req(tpAniSirGlobal pMac, mmhMsg.bodyptr = pSmeBcnReportReq; MTRACE(mac_trace(pMac, TRACE_CODE_TX_SME_MSG, pSessionEntry->peSessionId, mmhMsg.type)); - return lim_sys_process_mmh_msg_api(pMac, &mmhMsg, ePROT); + if (eSIR_SUCCESS != lim_sys_process_mmh_msg_api(pMac, &mmhMsg, ePROT)) + return eRRM_FAILURE; + return eRRM_SUCCESS; } /* -------------------------------------------------------------------- */ diff --git a/core/sap/dfs/src/dfs_process_radarevent.c b/core/sap/dfs/src/dfs_process_radarevent.c index 3afc30233f61..c40ada404d92 100644 --- a/core/sap/dfs/src/dfs_process_radarevent.c +++ b/core/sap/dfs/src/dfs_process_radarevent.c @@ -721,7 +721,8 @@ int dfs_process_radarevent(struct ath_dfs *dfs, */ if ((deltaT > - (dfs->dfs_pri_multiplier * + ((u_int64_t)dfs-> + dfs_pri_multiplier * rf->rf_maxpri)) || (deltaT < rf->rf_minpri)) { |