From 5bb67b78e4bbe31a78bafe022ec6c747dbbd1c51 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sat, 24 Mar 2018 15:01:59 -0700 Subject: [PATCH] qcacld-3.0: Remove obsolete idle scan flags Remove the following obsolete fields from struct csr_scanstruct: - fCancelIdleScan - fRestartIdleScan - nIdleScanTimeGap Change-Id: I50fd4d966586487111a55fc378a06783636a7df9 CRs-Fixed: 2212877 --- core/sme/inc/csr_internal.h | 3 --- core/sme/src/csr/csr_api_roam.c | 2 -- 2 files changed, 5 deletions(-) diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index 786387c65e0e..3d7377ceac96 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -666,7 +666,6 @@ struct csr_scanstruct { v_REGDOMAIN_t domainIdDefault; /* default regulatory domain */ v_REGDOMAIN_t domainIdCurrent; /* current regulatory domain */ - bool fCancelIdleScan; uint8_t countryCodeCount; /* counts for various advertized country codes */ struct csr_votes11d votes11d[CSR_MAX_NUM_COUNTRY_CODE]; @@ -675,8 +674,6 @@ struct csr_scanstruct { * will use the most popular one (max count) */ uint8_t countryCodeElected[WNI_CFG_COUNTRY_CODE_LEN]; - bool fRestartIdleScan; - uint32_t nIdleScanTimeGap; /* keep a track of channels to be scnned while in traffic condition */ struct csr_oschannel_mask osScanChannelMask; uint16_t nBssLimit; /* the maximum number of BSS in scan cache */ diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 861114d88744..79159e55a5eb 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -1156,8 +1156,6 @@ QDF_STATUS csr_stop(tpAniSirGlobal pMac, tHalStopType stopType) csr_roam_close_session(pMac, sessionId, true); ucfg_scan_set_enable(pMac->psoc, false); - pMac->scan.fCancelIdleScan = false; - pMac->scan.fRestartIdleScan = false; for (sessionId = 0; sessionId < CSR_ROAM_SESSION_MAX; sessionId++) csr_neighbor_roam_close(pMac, sessionId);