A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 15:11:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Remove obsolete member variables of tAniSirLim

Browse source 
Remove obsolete members variables of tAniSirLim and functions
using them.

Change-Id: I98c1caac415ca90a1101b64e49b0909b46d42616
CRs-Fixed: 2257774
This commit is contained in:
Naveen Rawat 2018-06-10 22:24:24 -07:00 • committed by nshrivas
commit b2fcd477cd
15 changed files with 40 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files

70
core/mac/inc/ani_global.h
View file

@ -368,61 +368,10 @@ typedef struct sAniSirLim {
/* //////////////////////////////////// TIMER RELATED END /////////////////////////////////////////// */
/* //////////////////////////////////// SCAN/LEARN RELATED START /////////////////////////////////////////// */
/**
* This flag when set, will use scan mode instead of
* Learn mode on BP/AP. By default this flag is set
* to true until HIF getting stuck in 0x800 state is
* debugged.
*/
uint32_t gLimUseScanModeForLearnMode;
/**
* This is useful for modules other than LIM
* to see if system is in scan/learn mode or not
*/
uint32_t gLimSystemInScanLearnMode;
/* Scan related globals on STA */
uint8_t gLimReturnAfterFirstMatch;
uint8_t gLim24Band11dScanDone;
uint8_t gLim50Band11dScanDone;
uint8_t gLimReturnUniqueResults;
/* / Place holder for current channel ID */
/* / being scanned */
uint32_t gLimCurrentScanChannelId;
/* Hold onto SCAN criteria */
/* The below is used in P2P GO case when we need to defer processing SME Req
* to LIM and insert NOA first and process SME req once SNOA is started
*/
uint16_t gDeferMsgTypeForNOA;
uint32_t *gpDefdSmeMsgForNOA;
/* Used to store the list of legacy bss sta detected during scan on one channel */
uint16_t gLimRestoreCBNumScanInterval;
uint16_t gLimRestoreCBCount;
tSirMacAddr gLimLegacyBssidList[MAX_NUM_LEGACY_BSSID_PER_CHANNEL];
/* abort scan is used to abort an on-going scan */
uint8_t abortScan;
tLimScanChnInfo scanChnInfo;
struct lim_scan_channel_status scan_channel_status;
/* //////////////////////////////////// SCAN/LEARN RELATED START /////////////////////////////////////////// */
tSirMacAddr gSelfMacAddr; /* added for BT-AMP Support */
/* //////////////////////////////////////// BSS RELATED END /////////////////////////////////////////// */
/* Place holder for StartBssReq message */
/* received by SME state machine */
uint8_t gLimCurrentBssUapsd;
/* This is used for testing sta legacy bss detect feature */
uint8_t gLimForceNoPropIE;
/* */
/* Store the BSS Index returned by HAL during */
/* WMA_ADD_BSS_RSP here. */
@ -520,13 +469,6 @@ typedef struct sAniSirLim {
#endif
/* Time stamp of the last beacon received from the BSS to which STA is connected. */
uint64_t gLastBeaconTimeStamp;
/* RX Beacon count for the current BSS to which STA is connected. */
uint32_t gCurrentBssBeaconCnt;
uint8_t gLastBeaconDtimCount;
uint8_t gLastBeaconDtimPeriod;
/* //////////////////////////////////////// STATS/COUNTER RELATED END /////////////////////////////////////////// */
/* //////////////////////////////////////// STATES RELATED START /////////////////////////////////////////// */
@ -576,11 +518,6 @@ typedef struct sAniSirLim {
/* ---------------- DPH ----------------------- */
/* these used to live in DPH but are now moved here (where they belong) */
uint32_t gLimPhyMode;
uint32_t propRateAdjustPeriod;
uint32_t scanStartTime; /* used to measure scan time */
uint8_t gLimMyMacAddr[6];
uint8_t ackPolicy;
uint8_t gLimQosEnabled:1; /* 11E */
uint8_t gLimWmeEnabled:1; /* WME */
@ -713,9 +650,6 @@ typedef struct sAniSirLim {
/* MIMO Power Save */
tSirMacHTMIMOPowerSaveState gHTMIMOPSState;
/* Scan In Power Save */
uint8_t gScanInPowersave;
/* */
/* A-MPDU Density */
/* 000 - No restriction */
@ -805,7 +739,6 @@ typedef struct sAniSirLim {
* there is no session context in PE, e.g. Scan related messages.
**/
uint8_t gSmeSessionId;
uint16_t gTransactionId;
tSirRemainOnChnReq *gpLimRemainOnChanReq; /* hold remain on chan request in this buf */
qdf_mutex_t lim_frame_register_lock;
@ -825,12 +758,9 @@ typedef struct sAniSirLim {
/* Number of channel switch IEs sent so far */
uint8_t gLimDfsChanSwTxCount;
uint8_t gLimDfsTargetChanNum;
uint8_t probeCounter;
uint8_t maxProbe;
QDF_STATUS(*sme_msg_callback)
(tHalHandle hal, struct scheduler_msg *msg);
uint8_t retry_packet_cnt;
uint8_t scan_disabled;
uint8_t beacon_probe_rsp_cnt_per_scan;
wlan_scan_requester req_id;
bool global_obss_offload_enabled;

5
core/mac/inc/sir_api.h
View file

@ -2146,11 +2146,6 @@ typedef struct sSmeGetScanChnRsp {
tLimScanChn scanChn[1];
} tSmeGetScanChnRsp, *tpSmeGetScanChnRsp;
typedef struct sLimScanChnInfo {
uint8_t numChnInfo; /* number of channels in scanChn */
tLimScanChn scanChn[SIR_MAX_SUPPORTED_CHANNEL_LIST];
} tLimScanChnInfo;
typedef struct sSirSmeGetAssocSTAsReq {
uint16_t messageType; /* eWNI_SME_GET_ASSOC_STAS_REQ */
uint16_t length;

5
core/mac/inc/sir_mac_prop_exts.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2015, 2017 The Linux Foundation. All rights reserved.
* Copyright (c) 2011-2015, 2017-2018 The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
@ -90,9 +90,6 @@ typedef struct sSirMacPropVersion {
uint8_t build_version[SIR_PROP_VERSION_STR_MAX];
} tSirMacPropVersion, *tpSirMacPropVersion;
/* Default value for gLimRestoreCBNumScanInterval */
#define LIM_RESTORE_CB_NUM_SCAN_INTERVAL_DEFAULT 2
/* generic proprietary IE structure definition */
typedef struct sSirPropIEStruct {
uint8_t propRatesPresent:1;

1
core/mac/src/pe/include/lim_api.h
View file

@ -268,7 +268,6 @@ void lim_mon_init_session(tpAniSirGlobal mac_ptr,
#define limGetWmeMode(psessionEntry, pVal) (*(pVal) = (psessionEntry)->limWmeEnabled)
#define limGetWsmMode(psessionEntry, pVal) (*(pVal) = (psessionEntry)->limWsmEnabled)
#define limGet11dMode(psessionEntry, pVal) (*(pVal) = (psessionEntry)->lim11dEnabled)
#define limGetAckPolicy(pMac, pVal) (*(pVal) = pMac->lim.ackPolicy)
/* ----------------------------------------------------------------------- */
static inline void lim_get_phy_mode(tpAniSirGlobal pMac, uint32_t *phyMode,
tpPESession psessionEntry)

54
core/mac/src/pe/lim/lim_api.c
View file

@ -73,31 +73,6 @@
static void __lim_init_scan_vars(tpAniSirGlobal pMac)
{
pMac->lim.gLimUseScanModeForLearnMode = 1;
pMac->lim.gLimSystemInScanLearnMode = 0;
/* Scan related globals on STA */
pMac->lim.gLimReturnAfterFirstMatch = 0;
pMac->lim.gLim24Band11dScanDone = 0;
pMac->lim.gLim50Band11dScanDone = 0;
pMac->lim.gLimReturnUniqueResults = 0;
pMac->lim.gLimCurrentScanChannelId = 0;
pMac->lim.gDeferMsgTypeForNOA = 0;
pMac->lim.gpDefdSmeMsgForNOA = NULL;
pMac->lim.gLimRestoreCBNumScanInterval =
LIM_RESTORE_CB_NUM_SCAN_INTERVAL_DEFAULT;
pMac->lim.gLimRestoreCBCount = 0;
qdf_mem_set(pMac->lim.gLimLegacyBssidList,
sizeof(pMac->lim.gLimLegacyBssidList), 0);
/* Fill in default values */
/* abort scan is used to abort an on-going scan */
pMac->lim.abortScan = 0;
qdf_mem_set(&pMac->lim.scanChnInfo, sizeof(tLimScanChnInfo), 0);
qdf_mem_set(&pMac->lim.dfschannelList, sizeof(tSirDFSChannelList), 0);
}
@ -107,7 +82,6 @@ static void __lim_init_bss_vars(tpAniSirGlobal pMac)
sizeof(*pMac->lim.gpSession) * pMac->lim.maxBssId, 0);
/* This is for testing purposes only, be default should always be off */
pMac->lim.gLimForceNoPropIE = 0;
pMac->lim.gpLimMlmSetKeysReq = NULL;
}
@ -188,12 +162,6 @@ static void __lim_init_states(tpAniSirGlobal pMac)
sizeof(tLimNoShortSlotParams), 0);
pMac->lim.gLimPhyMode = 0;
pMac->lim.scanStartTime = 0; /* used to measure scan time */
qdf_mem_set(pMac->lim.gLimMyMacAddr, sizeof(pMac->lim.gLimMyMacAddr),
0);
pMac->lim.ackPolicy = 0;
pMac->lim.gLimProbeRespDisableFlag = 0; /* control over probe resp */
}
@ -231,14 +199,6 @@ static void __lim_init_vars(tpAniSirGlobal pMac)
/* admission control policy information */
qdf_mem_set(&pMac->lim.admitPolicyInfo, sizeof(tLimAdmitPolicyInfo), 0);
pMac->lim.gLastBeaconDtimCount = 0;
pMac->lim.gLastBeaconDtimPeriod = 0;
/* Scan in Power Save Flag */
pMac->lim.gScanInPowersave = 0;
pMac->lim.probeCounter = 0;
pMac->lim.maxProbe = 0;
}
static void __lim_init_assoc_vars(tpAniSirGlobal pMac)
@ -489,17 +449,11 @@ tSirRetStatus lim_start(tpAniSirGlobal pMac)
(pMac, TRACE_CODE_SME_STATE, NO_SESSION,
pMac->lim.gLimSmeState));
/* By default do not return after first scan match */
pMac->lim.gLimReturnAfterFirstMatch = 0;
/* Initialize MLM state machine */
if (eSIR_SUCCESS != lim_init_mlm(pMac)) {
pe_err("Init MLM failed");
return eSIR_FAILURE;
}
/* By default return unique scan results */
pMac->lim.gLimReturnUniqueResults = true;
} else {
/**
* Should not have received eWNI_SME_START_REQ in states
@ -657,11 +611,6 @@ void lim_cleanup(tpAniSirGlobal pMac)
pMac->lim.gpLimMlmAuthReq = NULL;
}
if (pMac->lim.gpDefdSmeMsgForNOA != NULL) {
qdf_mem_free(pMac->lim.gpDefdSmeMsgForNOA);
pMac->lim.gpDefdSmeMsgForNOA = NULL;
}
if (pMac->lim.limDisassocDeauthCnfReq.pMlmDisassocReq) {
qdf_mem_free(pMac->lim.limDisassocDeauthCnfReq.pMlmDisassocReq);
pMac->lim.limDisassocDeauthCnfReq.pMlmDisassocReq = NULL;
@ -717,9 +666,6 @@ static void lim_state_info_dump(char **buf_ptr, uint16_t *size)
"\n MlmState: %d", mac->lim.gLimMlmState);
len += qdf_scnprintf(buf + len, *size - len,
"\n PrevMlmState: %d", mac->lim.gLimPrevMlmState);
len += qdf_scnprintf(buf + len, *size - len,
"\n SystemInScanLearnMode: %d",
mac->lim.gLimSystemInScanLearnMode);
len += qdf_scnprintf(buf + len, *size - len,
"\n ProcessDefdMsgs: %d", mac->lim.gLimProcessDefdMsgs);

2
core/mac/src/pe/lim/lim_assoc_utils.c
View file

@ -616,8 +616,6 @@ lim_cleanup_rx_path(tpAniSirGlobal pMac, tpDphHashNode pStaDs,
/* Deactivating probe after heart beat timer */
lim_deactivate_and_change_timer(pMac, eLIM_PROBE_AFTER_HB_TIMER);
lim_deactivate_and_change_timer(pMac, eLIM_JOIN_FAIL_TIMER);
pMac->lim.gLastBeaconDtimCount = 0;
pMac->lim.gLastBeaconDtimPeriod = 0;
}
#ifdef WLAN_DEBUG
/* increment a debug count */

16
core/mac/src/pe/lim/lim_process_cfg_updates.c
View file

@ -240,15 +240,6 @@ void lim_handle_cf_gparam_update(tpAniSirGlobal pMac, uint32_t cfgId)
}
break;
case WNI_CFG_SCAN_IN_POWERSAVE:
if (wlan_cfg_get_int(pMac, WNI_CFG_SCAN_IN_POWERSAVE, &val1) !=
eSIR_SUCCESS) {
pe_err("Unable to get WNI_CFG_SCAN_IN_POWERSAVE");
break;
}
pMac->lim.gScanInPowersave = (uint8_t) val1;
break;
case WNI_CFG_ASSOC_STA_LIMIT:
if (wlan_cfg_get_int(pMac, WNI_CFG_ASSOC_STA_LIMIT, &val1) !=
eSIR_SUCCESS) {
@ -317,11 +308,6 @@ void lim_apply_configuration(tpAniSirGlobal pMac, tpPESession psessionEntry)
pe_err("could not retrieve WNI_CFG_SCAN_IN_POWERSAVE");
return;
}
pe_debug("pMac->lim.gScanInPowersave = %hu",
pMac->lim.gScanInPowersave);
pMac->lim.gScanInPowersave = (uint8_t) val;
} /*** end lim_apply_configuration() ***/
/**
@ -345,8 +331,6 @@ static void lim_update_config(tpAniSirGlobal pMac, tpPESession psessionEntry)
{
uint32_t val;
sir_copy_mac_addr(pMac->lim.gLimMyMacAddr, psessionEntry->selfMacAddr);
if (wlan_cfg_get_int(pMac, WNI_CFG_SHORT_PREAMBLE, &val) != eSIR_SUCCESS)
pe_err("cfg get short preamble failed");
psessionEntry->beaconParams.fShortPreamble = (val) ? 1 : 0;

75
core/mac/src/pe/lim/lim_process_message_queue.c
View file

@ -429,35 +429,38 @@ static void lim_process_hw_mode_trans_ind(tpAniSirGlobal mac, void *body)
\return none
-------------------------------------------------------------*/
uint8_t static def_msg_decision(tpAniSirGlobal pMac, struct scheduler_msg *limMsg)
static uint8_t def_msg_decision(tpAniSirGlobal mac_ctx,
struct scheduler_msg *lim_msg)
{
uint8_t type, subtype;
QDF_STATUS status;
bool mgmt_pkt_defer = true;
/* this function should not changed */
if (pMac->lim.gLimSmeState == eLIM_SME_OFFLINE_STATE) {
/* this function should not changed */
if (mac_ctx->lim.gLimSmeState == eLIM_SME_OFFLINE_STATE) {
/* Defer processing this message */
if (lim_defer_msg(pMac, limMsg) != TX_SUCCESS) {
if (lim_defer_msg(mac_ctx, lim_msg) != TX_SUCCESS) {
QDF_TRACE(QDF_MODULE_ID_PE, LOGE,
FL("Unable to Defer Msg"));
lim_log_session_states(pMac);
lim_handle_defer_msg_error(pMac, limMsg);
lim_log_session_states(mac_ctx);
lim_handle_defer_msg_error(mac_ctx, lim_msg);
}
return true;
}
/* When defer is requested then defer all the messages except HAL responses. */
if ((!lim_is_system_in_scan_state(pMac))
&& (true != GET_LIM_PROCESS_DEFD_MESGS(pMac))
&& !pMac->lim.gLimSystemInScanLearnMode) {
if (limMsg->type == SIR_BB_XPORT_MGMT_MSG) {
/*
* When defer is requested then defer all the messages except
* HAL responses.
*/
if (!lim_is_system_in_scan_state(mac_ctx) &&
!GET_LIM_PROCESS_DEFD_MESGS(mac_ctx)) {
if (lim_msg->type == SIR_BB_XPORT_MGMT_MSG) {
/*
* Dont defer beacon and probe response
* because it will fill the differ queue quickly
*/
status = lim_util_get_type_subtype(limMsg->bodyptr,
&type, &subtype);
status = lim_util_get_type_subtype(lim_msg->bodyptr,
&type, &subtype);
if (QDF_IS_STATUS_SUCCESS(status) &&
(type == SIR_MAC_MGMT_FRAME) &&
((subtype == SIR_MAC_MGMT_BEACON) ||
@ -465,19 +468,19 @@ uint8_t static def_msg_decision(tpAniSirGlobal pMac, struct scheduler_msg *limMs
mgmt_pkt_defer = false;
}
if ((limMsg->type != WMA_ADD_BSS_RSP)
&& (limMsg->type != WMA_DELETE_BSS_RSP)
&& (limMsg->type != WMA_DELETE_BSS_HO_FAIL_RSP)
&& (limMsg->type != WMA_ADD_STA_RSP)
&& (limMsg->type != WMA_DELETE_STA_RSP)
&& (limMsg->type != WMA_SET_BSSKEY_RSP)
&& (limMsg->type != WMA_SET_STAKEY_RSP)
&& (limMsg->type != WMA_SET_STA_BCASTKEY_RSP)
&& (limMsg->type != WMA_AGGR_QOS_RSP)
&& (limMsg->type != WMA_SET_MIMOPS_RSP)
&& (limMsg->type != WMA_SWITCH_CHANNEL_RSP)
&& (limMsg->type != WMA_P2P_NOA_ATTR_IND)
&& (limMsg->type != WMA_ADD_TS_RSP) &&
if ((lim_msg->type != WMA_ADD_BSS_RSP) &&
(lim_msg->type != WMA_DELETE_BSS_RSP) &&
(lim_msg->type != WMA_DELETE_BSS_HO_FAIL_RSP) &&
(lim_msg->type != WMA_ADD_STA_RSP) &&
(lim_msg->type != WMA_DELETE_STA_RSP) &&
(lim_msg->type != WMA_SET_BSSKEY_RSP) &&
(lim_msg->type != WMA_SET_STAKEY_RSP) &&
(lim_msg->type != WMA_SET_STA_BCASTKEY_RSP) &&
(lim_msg->type != WMA_AGGR_QOS_RSP) &&
(lim_msg->type != WMA_SET_MIMOPS_RSP) &&
(lim_msg->type != WMA_SWITCH_CHANNEL_RSP) &&
(lim_msg->type != WMA_P2P_NOA_ATTR_IND) &&
(lim_msg->type != WMA_ADD_TS_RSP) &&
/*
* LIM won't process any defer queue commands if gLimAddtsSent is
* set to TRUE. gLimAddtsSent will be set TRUE to while sending
@ -490,24 +493,23 @@ uint8_t static def_msg_decision(tpAniSirGlobal pMac, struct scheduler_msg *limMs
* enabled, so that this will be processed immediately and sets
* gLimAddtsSent to FALSE.
*/
(limMsg->type != SIR_LIM_ADDTS_RSP_TIMEOUT) &&
(lim_msg->type != SIR_LIM_ADDTS_RSP_TIMEOUT) &&
/* Allow processing of RX frames while awaiting reception
* of ADD TS response over the air. This logic particularly
* handles the case when host sends ADD BA request to FW
* after ADD TS request is sent over the air and
* ADD TS response received over the air */
!(limMsg->type == SIR_BB_XPORT_MGMT_MSG &&
pMac->lim.gLimAddtsSent) &&
(mgmt_pkt_defer)) {
!(lim_msg->type == SIR_BB_XPORT_MGMT_MSG &&
mac_ctx->lim.gLimAddtsSent) &&
(mgmt_pkt_defer)) {
pe_debug("Defer the current message %s , gLimProcessDefdMsgs is false and system is not in scan/learn mode",
lim_msg_str(limMsg->type));
lim_msg_str(lim_msg->type));
/* Defer processing this message */
if (lim_defer_msg(pMac, limMsg) != TX_SUCCESS) {
if (lim_defer_msg(mac_ctx, lim_msg) != TX_SUCCESS) {
QDF_TRACE(QDF_MODULE_ID_PE, LOGE,
FL("Unable to Defer Msg"));
lim_log_session_states(pMac);
lim_handle_defer_msg_error(pMac, limMsg);
FL("Unable to Defer Msg"));
lim_log_session_states(mac_ctx);
lim_handle_defer_msg_error(mac_ctx, lim_msg);
}
return true;
}
@ -2104,7 +2106,6 @@ static void lim_process_deferred_message_queue(tpAniSirGlobal pMac)
if ((lim_is_system_in_scan_state(pMac))
|| (true != GET_LIM_PROCESS_DEFD_MESGS(pMac))
|| (pMac->lim.gLimSystemInScanLearnMode)
|| pMac->lim.gLimAddtsSent)
break;
}

43
core/mac/src/pe/lim/lim_process_mlm_req_messages.c
View file

@ -180,23 +180,6 @@ void lim_process_mlm_req_messages(tpAniSirGlobal mac_ctx,
} /* switch (msg->type) */
}
/* WLAN_SUSPEND_LINK Related */
/**
* lim_is_link_suspended()- check if link is suspended
* @mac_ctx: global MAC context
*
* This function returns is link is suspended or not.
* Since Suspend link uses init scan, it just returns
* gLimSystemInScanLearnMode flag.
*
* Return: uint8_t(gLimSystemInScanLearnMode flag)
*/
uint8_t lim_is_link_suspended(tpAniSirGlobal mac_ctx)
{
return mac_ctx->lim.gLimSystemInScanLearnMode;
}
/**
* lim_change_channel_with_callback() - change channel and register callback
* @mac_ctx: global MAC context
@ -339,27 +322,6 @@ void lim_set_dfs_channel_list(tpAniSirGlobal mac_ctx, uint8_t chan_num,
return;
}
/**
* lim_restore_pre_scan_state() - restore HW state prior to scan
*
* @mac_ctx: global MAC context
*
* This function is called by lim_continue_channel_scan()
* to restore HW state prior to entering 'scan state'
*
* Return: None
*/
void lim_restore_pre_scan_state(tpAniSirGlobal mac_ctx)
{
/* Deactivate MIN/MAX channel timers if running */
lim_deactivate_and_change_timer(mac_ctx, eLIM_MIN_CHANNEL_TIMER);
lim_deactivate_and_change_timer(mac_ctx, eLIM_MAX_CHANNEL_TIMER);
mac_ctx->lim.gLimSystemInScanLearnMode = 0;
pe_debug("Scan ended, took %llu tu",
(tx_time_get() - mac_ctx->lim.scanStartTime));
}
/**
* mlm_add_sta() - MLM add sta
* @mac_ctx: global MAC context
@ -939,11 +901,6 @@ static void lim_process_mlm_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg)
/* suspend link */
pe_debug("Suspend link, sessionid %d is off channel",
sessionid);
if (lim_is_link_suspended(mac_ctx)) {
pe_err("link is already suspended, session %d",
sessionid);
goto error;
}
lim_process_mlm_post_join_suspend_link(mac_ctx,
QDF_STATUS_SUCCESS, (uint32_t *)session);
} else {

8
core/mac/src/pe/lim/lim_scan_result_utils.c
View file

@ -133,14 +133,6 @@ lim_collect_bss_description(tpAniSirGlobal pMac,
*/
pBssDescr->channelId = lim_get_channel_from_beacon(pMac, pBPR);
if (pBssDescr->channelId == 0) {
/* If the channel Id is not retrieved from Beacon, extract the channel from BD */
if (!rxChannel) {
rxChannel = pMac->lim.gLimCurrentScanChannelId;
}
pBssDescr->channelId = rxChannel;
}
pBssDescr->channelIdSelf = pBssDescr->channelId;
pBssDescr->rx_channel = rxChannel;

20
core/mac/src/pe/lim/lim_timer_utils.c
View file

@ -221,7 +221,6 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac)
uint32_t lim_create_timers(tpAniSirGlobal pMac)
{
uint32_t cfgValue, i = 0;
uint32_t cfgValue1;
pe_debug("Creating Timers used by LIM module in Role: %d",
pMac->lim.gLimSystemRole);
@ -229,25 +228,6 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac)
if (TX_SUCCESS != lim_create_timers_host_roam(pMac))
return TX_TIMER_ERROR;
if (wlan_cfg_get_int(pMac, WNI_CFG_ACTIVE_MINIMUM_CHANNEL_TIME,
&cfgValue) != eSIR_SUCCESS) {
pe_err("could not retrieve MinChannelTimeout value");
}
cfgValue = SYS_MS_TO_TICKS(cfgValue);
/* Periodic probe request timer value is half of the Min channel
* timer. Probe request sends periodically till min/max channel
* timer expires
*/
cfgValue1 = cfgValue / 2;
if (wlan_cfg_get_int(pMac, WNI_CFG_ACTIVE_MAXIMUM_CHANNEL_TIME,
&cfgValue) != eSIR_SUCCESS)
pe_err("could not retrieve MAXChannelTimeout value");
cfgValue = SYS_MS_TO_TICKS(cfgValue);
/* Limiting max numm of probe req for each channel scan */
pMac->lim.maxProbe = (cfgValue / cfgValue1);
if (pMac->lim.gLimSystemRole != eLIM_AP_ROLE)
if (false == lim_create_non_ap_timers(pMac))
goto err_timer;

3
core/mac/src/pe/lim/lim_types.h
View file

@ -760,9 +760,6 @@ void lim_covert_channel_scan_type(tpAniSirGlobal pMac, uint8_t channelNum,
void lim_set_dfs_channel_list(tpAniSirGlobal pMac, uint8_t channelNum,
tSirDFSChannelList *dfsChannelList);
void limContinueChannelLearn(tpAniSirGlobal);
/* WLAN_SUSPEND_LINK Related */
uint8_t lim_is_link_suspended(tpAniSirGlobal pMac);
/* end WLAN_SUSPEND_LINK Related */
#ifdef WLAN_FEATURE_11W
/* 11w send SA query request action frame */

5
core/mac/src/pe/lim/lim_utils.c
View file

@ -4872,11 +4872,6 @@ lim_get_b_dfrom_rx_packet(tpAniSirGlobal pMac, void *body, uint32_t **pRxPacketI
*pRxPacketInfo = (uint32_t *) body;
} /*** end lim_get_b_dfrom_rx_packet() ***/
void lim_resset_scan_channel_info(tpAniSirGlobal pMac)
{
qdf_mem_set(&pMac->lim.scanChnInfo, sizeof(tLimScanChnInfo), 0);
}
void lim_add_channel_status_info(tpAniSirGlobal p_mac,
struct lim_channel_status *channel_stat,
uint8_t channel_id)

1
core/mac/src/pe/lim/lim_utils.h
View file

@ -485,7 +485,6 @@ tSirRetStatus lim_post_sm_state_update(tpAniSirGlobal pMac,
void lim_delete_sta_context(tpAniSirGlobal pMac, struct scheduler_msg *limMsg);
void lim_delete_dialogue_token_list(tpAniSirGlobal pMac);
void lim_resset_scan_channel_info(tpAniSirGlobal pMac);
/**
* lim_add_channel_status_info() - store

3
core/mac/src/sys/legacy/src/system/src/sys_entry_func.c
View file

@ -115,8 +115,7 @@ sys_bbt_process_message_core(tpAniSirGlobal mac_ctx, struct scheduler_msg *msg,
*/
if ((subtype == SIR_MAC_MGMT_BEACON) &&
(!lim_is_system_in_scan_state(mac_ctx)) &&
(GET_LIM_PROCESS_DEFD_MESGS(mac_ctx) != true) &&
!mac_ctx->lim.gLimSystemInScanLearnMode) {
(GET_LIM_PROCESS_DEFD_MESGS(mac_ctx) != true)) {
pe_debug("dropping received beacon in deffered state");
goto fail;
}