qcacld-3.0: Remove gLimHalScanState

LIM is no longer involved in scan so remove gLimHalScanState.

Change-Id: Ie6fca2c71178da642aa065f6a24493df82144156
CRs-Fixed: 2212880
This commit is contained in:
Jeff Johnson 2018-03-24 15:04:36 -07:00 • committed by nshrivas
commit 5ec4d8c45e
4 changed files with 2 additions and 29 deletions

View file

@ -531,8 +531,6 @@ typedef struct sAniSirLim {
/* / Previous MLM State */
tLimMlmStates gLimPrevMlmState;
/* LIM to HAL SCAN Management Message Interface states */
tLimLimHalScanState gLimHalScanState;
/* WLAN_SUSPEND_LINK Related */
SUSPEND_RESUME_LINK_CALLBACK gpLimSuspendCallback;
uint32_t *gpLimSuspendData;

View file

@ -209,25 +209,6 @@ typedef void (*SUSPEND_RESUME_LINK_CALLBACK)(tpAniSirGlobal pMac,
QDF_STATUS status,
uint32_t *data);
/* LIM to HAL SCAN Management Message Interface states */
typedef enum eLimHalScanState {
eLIM_HAL_IDLE_SCAN_STATE,
eLIM_HAL_INIT_SCAN_WAIT_STATE,
eLIM_HAL_START_SCAN_WAIT_STATE,
eLIM_HAL_END_SCAN_WAIT_STATE,
eLIM_HAL_FINISH_SCAN_WAIT_STATE,
eLIM_HAL_INIT_LEARN_WAIT_STATE,
eLIM_HAL_START_LEARN_WAIT_STATE,
eLIM_HAL_END_LEARN_WAIT_STATE,
eLIM_HAL_FINISH_LEARN_WAIT_STATE,
eLIM_HAL_SCANNING_STATE,
/* WLAN_SUSPEND_LINK Related */
eLIM_HAL_SUSPEND_LINK_WAIT_STATE,
eLIM_HAL_SUSPEND_LINK_STATE,
eLIM_HAL_RESUME_LINK_WAIT_STATE,
/* end WLAN_SUSPEND_LINK Related */
} tLimLimHalScanState;
/* MLM Req/Cnf structure definitions */
typedef struct sLimMlmAuthReq {
tSirMacAddr peerMacAddr;

View file

@ -185,9 +185,6 @@ static void __lim_init_states(tpAniSirGlobal pMac)
/* / Previous MLM State */
pMac->lim.gLimPrevMlmState = eLIM_MLM_OFFLINE_STATE;
/* LIM to HAL SCAN Management Message Interface states */
pMac->lim.gLimHalScanState = eLIM_HAL_IDLE_SCAN_STATE;
/**
* Initialize state to eLIM_SME_OFFLINE_STATE
*/
@ -736,8 +733,6 @@ static void lim_state_info_dump(char **buf_ptr, uint16_t *size)
mac->lim.gLimSystemInScanLearnMode);
len += qdf_scnprintf(buf + len, *size - len,
"\n ProcessDefdMsgs: %d", mac->lim.gLimProcessDefdMsgs);
len += qdf_scnprintf(buf + len, *size - len,
"\n gLimHalScanState: %d", mac->lim.gLimHalScanState);
*size -= len;
*buf_ptr += len;

View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
* Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@ -356,8 +356,7 @@ lim_process_probe_req_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info,
* come to idle state.
*/
if ((session->pePersona == QDF_P2P_GO_MODE) &&
((mac_ctx->lim.gpLimRemainOnChanReq) ||
(mac_ctx->lim.gLimHalScanState != eLIM_HAL_IDLE_SCAN_STATE))) {
mac_ctx->lim.gpLimRemainOnChanReq) {
pe_debug("GO is scanning, don't send probersp on diff chnl");
return;
}