From d3b31e205a1d600ea2c9dce79490bd450088e1f5 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Wed, 28 Jun 2017 00:15:10 -0700 Subject: [PATCH] qcacld-3.0: Fix clang warnings in LIM qcacld-3.0/core/mac/src/pe/lim/lim_process_mlm_req_messages.c:487:10: warning: implicit conversion from enumeration type 'enum eSirRetStatus' to different enumeration type 'tSirResultCodes' (aka 'enum eSirResultCodes') [-Wenum-conversion] qcacld-3.0/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c:459:37: warning: implicit conversion from enumeration type 'tLimSmeStates' (aka 'enum eLimSmeStates') to different enumeration type 'tLimMlmStates' (aka 'enum eLimMlmStates') [-Wenum-conversion]. Change-Id: I649618105b220d69c8b79dcae0983ae6d75746c0 CRs-Fixed: 2055487 --- core/mac/src/pe/include/lim_session.h | 2 +- core/mac/src/pe/lim/lim_process_mlm_req_messages.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/mac/src/pe/include/lim_session.h b/core/mac/src/pe/include/lim_session.h index a1d37e616c8c..ee757fe5c3f0 100644 --- a/core/mac/src/pe/include/lim_session.h +++ b/core/mac/src/pe/include/lim_session.h @@ -55,7 +55,7 @@ typedef struct tagComebackTimerInfo { tpAniSirGlobal pMac; uint8_t sessionID; tLimMlmStates limPrevMlmState; /* Previous MLM State */ - tLimSmeStates limMlmState; /* MLM State */ + tLimMlmStates limMlmState; /* MLM State */ } tComebackTimerInfo; #endif /* WLAN_FEATURE_11W */ /*-------------------------------------------------------------------------- diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c index 030e1fd7ffd8..7b0d693e728d 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c @@ -489,7 +489,7 @@ lim_mlm_add_bss(tpAniSirGlobal mac_ctx, if (NULL == addbss_param) { pe_err("Unable to allocate memory during ADD_BSS"); /* Respond to SME with LIM_MLM_START_CNF */ - return eSIR_MEM_ALLOC_FAILED; + return eSIR_SME_RESOURCES_UNAVAILABLE; } /* Fill in tAddBssParams members */