qcacld-3.0: Cleanup unused scan code

Cleanup the unused legacy scan code.

Change-Id: Ia664f815759142e7f4ad8e648a469c63ddd003f5
CRs-Fixed: 2193917

core/hdd/src/wlan_hdd_scan.c

@@ -337,30 +337,6 @@ void wlan_hdd_cfg80211_scan_block_cb(struct work_struct *work)
 	cds_ssr_unprotect(__func__);
 }
 
-/**
- * wlan_hdd_copy_bssid_scan_request() - API to copy the bssid to Scan request
- * @scan_req: Pointer to CSR Scan Request
- * @request: scan request from Supplicant
- *
- * This API copies the BSSID in scan request from Supplicant and copies it to
- * the CSR Scan request
- *
- * Return: None
- */
-#if defined(CFG80211_SCAN_BSSID) || \
-	(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0))
-static inline void wlan_hdd_copy_bssid_scan_request(tCsrScanRequest *scan_req,
-					struct cfg80211_scan_request *request)
-{
-	qdf_mem_copy(scan_req->bssid.bytes, request->bssid, QDF_MAC_ADDR_SIZE);
-}
-#else
-static inline void wlan_hdd_copy_bssid_scan_request(tCsrScanRequest *scan_req,
-					struct cfg80211_scan_request *request)
-{
-}
-#endif
-
 /*
  * wlan_hdd_update_scan_ies() - API to update the scan IEs of scan request
  * with already stored default scan IEs

core/mac/inc/ani_global.h

@@ -292,8 +292,6 @@ typedef struct sLimTimers {
 	/* Join Failure timeout on STA */
 	TX_TIMER gLimJoinFailureTimer;
 
-	TX_TIMER gLimPeriodicProbeReqTimer;
-
 	/* CNF_WAIT timer */
 	TX_TIMER *gpLimCnfWaitTimer;
 
@@ -384,9 +382,6 @@ typedef struct sAniSirLim {
 	uint16_t gDeferMsgTypeForNOA;
 	uint32_t *gpDefdSmeMsgForNOA;
 
-	tLimMlmScanReq *gpLimMlmScanReq;
-
-
 	/* Used to store the list of legacy bss sta detected during scan on one channel */
 	uint16_t gLimRestoreCBNumScanInterval;
 	uint16_t gLimRestoreCBCount;

core/mac/inc/sir_api.h

@@ -71,10 +71,6 @@ typedef struct sAniSirGlobal *tpAniSirGlobal;
 
 #define SIR_MAX_ELEMENT_ID         255
 
-/* Increase dwell time for P2P search in ms */
-#define P2P_SEARCH_DWELL_TIME_INCREASE   20
-#define P2P_SOCIAL_CHANNELS              3
-
 /* Max number of channels are 165, but to access 165th element of array,
    *array of 166 is required.
  */
@@ -377,8 +373,6 @@ struct rrm_config_param {
 #define IERATE_IS_BASICRATE(x)   ((x) & IERATE_BASICRATE_MASK)
 
 const char *lim_bss_type_to_string(const uint16_t bss_type);
-const char *lim_scan_type_to_string(const uint8_t scan_type);
-
 /**
  * struct sSirSupportedRates - stores rates/MCS supported
  * @llbRates: 11b rates in unit of 500kbps
@@ -870,117 +864,6 @@ typedef enum eSirLinkTrafficCheck {
 #define SIR_BG_SCAN_RETURN_LFR_CACHED_RESULTS          0x02
 #define SIR_BG_SCAN_PURGE_LFR_RESULTS                  0x40
 
-/* / Definition for scan request */
-typedef struct sSirSmeScanReq {
-	uint16_t messageType;   /* eWNI_SME_SCAN_REQ */
-	uint16_t length;
-	uint8_t sessionId;      /* Session ID */
-	uint16_t transactionId; /* Transaction ID for cmd */
-	struct qdf_mac_addr bssId;
-	tSirMacSSid ssId[SIR_SCAN_MAX_NUM_SSID];
-	struct qdf_mac_addr selfMacAddr;        /* Added For BT-AMP Support */
-	tSirBssType bssType;
-	uint8_t dot11mode;
-	tSirScanType scanType;
-	uint32_t scan_id;
-	/**
-	 * minChannelTime. Not used if scanType is passive.
-	 * 0x0 - Dont Use min channel timer. Only max channel timeout will used.
-	 * 11k measurements set this to 0 to user only single duration for scan.
-	 * <valid timeout> - Timeout value used for min channel timeout.
-	 */
-	uint32_t minChannelTime;
-	/**
-	 * maxChannelTime.
-	 * 0x0 - Invalid. In case of active scan.
-	 * In case of passive scan, MAX( maxChannelTime,
-	 * WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME) is used.
-	 */
-	uint32_t maxChannelTime;
-	enum wmi_dwelltime_adaptive_mode scan_adaptive_dwell_mode;
-	/**
-	 * returnAfterFirstMatch can take following values:
-	 * 0x00 - Return SCAN_RSP message after complete channel scan
-	 * 0x01 -  Return SCAN_RSP message after collecting BSS description
-	 *        that matches scan criteria.
-	 * 0xC0 - Return after collecting first 11d IE from 2.4 GHz &
-	 *        5 GHz band channels
-	 * 0x80 - Return after collecting first 11d IE from 5 GHz band
-	 *        channels
-	 * 0x40 - Return after collecting first 11d IE from 2.4 GHz
-	 *        band channels
-	 *
-	 * Values of 0xC0, 0x80 & 0x40 are to be used by
-	 * Roaming/application when 11d is enabled.
-	 */
-	/* in units of milliseconds, ignored when not connected */
-	uint32_t restTime;
-	/*in units of milliseconds, ignored when not connected*/
-	uint32_t min_rest_time;
-	/*in units of milliseconds, ignored when not connected*/
-	uint32_t idle_time;
-	uint8_t returnAfterFirstMatch;
-
-	/**
-	 * returnUniqueResults can take following values:
-	 * 0 - Collect & report all received BSS descriptions from same BSS.
-	 * 1 - Collect & report unique BSS description from same BSS.
-	 */
-	uint8_t returnUniqueResults;
-
-	/**
-	 * returnFreshResults can take following values:
-	 * 0x00 - Return background scan results.
-	 * 0x80 - Return & purge background scan results
-	 * 0x01 - Trigger fresh scan instead of returning background scan
-	 *        results.
-	 * 0x81 - Trigger fresh scan instead of returning background scan
-	 *        results and purge background scan results.
-	 */
-	uint8_t returnFreshResults;
-
-	/*  backgroundScanMode can take following values:
-	 *  0x0 - agressive scan
-	 *  0x1 - normal scan where HAL will check for link traffic
-	 *        prior to proceeding with the scan
-	 */
-	tSirBackgroundScanMode backgroundScanMode;
-
-	uint8_t hiddenSsid;
-
-	/* Number of SSIDs to scan */
-	uint8_t numSsid;
-
-	/* channelList has to be the last member of this structure. Check
-	 * tSirChannelList for the reason. This MUST be the last field of the
-	 * structure
-	 */
-
-	bool p2pSearch;
-	uint16_t uIEFieldLen;
-	uint16_t uIEFieldOffset;
-
-	/* channelList MUST be the last field of this structure */
-	tSirChannelList channelList;
-	/*-----------------------------
-	   tSirSmeScanReq....
-	   -----------------------------
-	   uIEFiledLen
-	   -----------------------------
-	   uIEFiledOffset               ----+
-	   -----------------------------    |
-	   channelList.numChannels          |
-	   -----------------------------    |
-	   ... variable size up to          |
-	   channelNumber[numChannels-1]     |
-	   This can be zero, if             |
-	   numChannel is zero.              |
-	   ----------------------------- <--+
-	   ... variable size uIEFiled
-	   up to uIEFieldLen (can be 0)
-	   -----------------------------*/
-} tSirSmeScanReq, *tpSirSmeScanReq;
-
 typedef struct sSirSmeScanAbortReq {
 	uint16_t type;
 	uint16_t msgLen;
@@ -3692,51 +3575,6 @@ typedef struct sAniHandoffReq {
 	uint8_t handoff_src;
 } tAniHandoffReq, *tpAniHandoffReq;
 
-typedef struct sSirScanOffloadReq {
-	uint8_t sessionId;
-	struct qdf_mac_addr bssId;
-	uint8_t numSsid;
-	tSirMacSSid ssId[SIR_SCAN_MAX_NUM_SSID];
-	uint8_t hiddenSsid;
-	struct qdf_mac_addr selfMacAddr;
-	tSirBssType bssType;
-	uint8_t dot11mode;
-	tSirScanType scanType;
-	uint32_t minChannelTime;
-	uint32_t maxChannelTime;
-	uint32_t scan_id;
-	uint32_t scan_requestor_id;
-	/* in units of milliseconds, ignored when not connected */
-	uint32_t restTime;
-	/*in units of milliseconds, ignored when not connected*/
-	uint32_t min_rest_time;
-	/*in units of milliseconds, ignored when not connected*/
-	uint32_t idle_time;
-	tSirP2pScanType p2pScanType;
-	enum wmi_dwelltime_adaptive_mode scan_adaptive_dwell_mode;
-	uint16_t uIEFieldLen;
-	uint16_t uIEFieldOffset;
-	uint32_t burst_scan_duration;
-	tSirChannelList channelList;
-	/*-----------------------------
-	  sSirScanOffloadReq....
-	  -----------------------------
-	  uIEFieldLen
-	  -----------------------------
-	  uIEFieldOffset               ----+
-	  -----------------------------    |
-	  channelList.numChannels          |
-	  -----------------------------    |
-	  ... variable size up to          |
-	  channelNumber[numChannels-1]     |
-	  This can be zero, if             |
-	  numChannel is zero.              |
-	  ----------------------------- <--+
-	  ... variable size uIEField
-	  up to uIEFieldLen (can be 0)
-	  -----------------------------*/
-} tSirScanOffloadReq, *tpSirScanOffloadReq;
-
 /**
  * sir_scan_event_type - scan event types used in LIM
  * @SIR_SCAN_EVENT_STARTED - scan command accepted by FW

core/mac/src/pe/include/lim_global.h

@@ -248,43 +248,6 @@ typedef struct sLimMlmJoinReq {
 	 */
 } tLimMlmJoinReq, *tpLimMlmJoinReq;
 
-typedef struct sLimMlmScanReq {
-	tSirBssType bssType;
-	tSirMacAddr bssId;
-	tSirMacSSid ssId[SIR_SCAN_MAX_NUM_SSID];
-	tSirScanType scanType;
-	uint32_t minChannelTime;
-	uint32_t maxChannelTime;
-	uint32_t dot11mode;
-	/* Number of SSIDs to scan(send Probe request) */
-	uint8_t numSsid;
-
-	bool p2pSearch;
-	uint16_t uIEFieldLen;
-	uint16_t uIEFieldOffset;
-
-	uint8_t sessionId;
-	/* channelList MUST be the last field of this structure */
-	tSirChannelList channelList;
-	/*-----------------------------
-	   tLimMlmScanReq....
-	   -----------------------------
-	   uIEFiledLen
-	   -----------------------------
-	   uIEFiledOffset               ----+
-	   -----------------------------    |
-	   channelList.numChannels          |
-	   -----------------------------    |
-	   ... variable size up to          |
-	   channelNumber[numChannels-1]     |
-	   This can be zero, if             |
-	   numChannel is zero.              |
-	   ----------------------------- <--+
-	   ... variable size uIEFiled
-	   up to uIEFieldLen (can be 0)
-	   -----------------------------*/
-} tLimMlmScanReq, *tpLimMlmScanReq;
-
 typedef struct tLimScanResultNode tLimScanResultNode;
 struct tLimScanResultNode {
 	tLimScanResultNode *next;

core/mac/src/pe/lim/lim_api.c

@@ -91,7 +91,6 @@ static void __lim_init_scan_vars(tpAniSirGlobal pMac)
 	pMac->lim.gLimReturnUniqueResults = 0;
 
 	pMac->lim.gLimCurrentScanChannelId = 0;
-	pMac->lim.gpLimMlmScanReq = NULL;
 	pMac->lim.gDeferMsgTypeForNOA = 0;
 	pMac->lim.gpDefdSmeMsgForNOA = NULL;
 
@@ -678,11 +677,6 @@ void lim_cleanup(tpAniSirGlobal pMac)
 		pMac->lim.gpDefdSmeMsgForNOA = NULL;
 	}
 
-	if (pMac->lim.gpLimMlmScanReq != NULL) {
-		qdf_mem_free(pMac->lim.gpLimMlmScanReq);
-		pMac->lim.gpLimMlmScanReq = NULL;
-	}
-
 	if (pMac->lim.limDisassocDeauthCnfReq.pMlmDisassocReq) {
 		qdf_mem_free(pMac->lim.limDisassocDeauthCnfReq.pMlmDisassocReq);
 		pMac->lim.limDisassocDeauthCnfReq.pMlmDisassocReq = NULL;

core/mac/src/pe/lim/lim_process_message_queue.c

@@ -1625,7 +1625,6 @@ static void lim_process_messages(tpAniSirGlobal mac_ctx,
 	case SIR_LIM_DELETE_STA_CONTEXT_IND:
 		lim_delete_sta_context(mac_ctx, msg);
 		break;
-	case SIR_LIM_PERIODIC_PROBE_REQ_TIMEOUT:
 	case SIR_LIM_JOIN_FAIL_TIMEOUT:
 	case SIR_LIM_PERIODIC_JOIN_PROBE_REQ_TIMEOUT:
 	case SIR_LIM_AUTH_FAIL_TIMEOUT:

core/mac/src/pe/lim/lim_process_mlm_req_messages.c

@@ -58,7 +58,6 @@ static void lim_process_mlm_deauth_req(tpAniSirGlobal, uint32_t *);
 static void lim_process_mlm_set_keys_req(tpAniSirGlobal, uint32_t *);
 
 /* MLM Timeout event handler templates */
-static void lim_process_periodic_probe_req_timer(tpAniSirGlobal mac_ctx);
 static void lim_process_auth_rsp_timeout(tpAniSirGlobal, uint32_t);
 static void lim_process_periodic_join_probe_req_timer(tpAniSirGlobal);
 static void lim_process_auth_retry_timer(tpAniSirGlobal);
@@ -151,9 +150,6 @@ void lim_process_mlm_req_messages(tpAniSirGlobal mac_ctx,
 	case LIM_MLM_SETKEYS_REQ:
 		lim_process_mlm_set_keys_req(mac_ctx, msg->bodyptr);
 		break;
-	case SIR_LIM_PERIODIC_PROBE_REQ_TIMEOUT:
-		lim_process_periodic_probe_req_timer(mac_ctx);
-		break;
 	case SIR_LIM_JOIN_FAIL_TIMEOUT:
 		lim_process_join_failure_timeout(mac_ctx);
 		break;
@@ -2246,70 +2242,6 @@ end:
 	mlm_set_keys_cnf.sessionId = mlm_set_keys_req->sessionId;
 	lim_post_sme_set_keys_cnf(mac_ctx, mlm_set_keys_req, &mlm_set_keys_cnf);
 }
-
-/**
- * lim_process_periodic_probe_req_timer() - This function is called to process
- * periodic probe request to send during scan.
- *
- * @mac_ctx:      Pointer to Global MAC structure
- *
- * This function is called to process periodic probe request to send during scan
- *
- * @Return None
- */
-static void lim_process_periodic_probe_req_timer(tpAniSirGlobal mac_ctx)
-{
-	uint8_t channel_num;
-	uint8_t i = 0;
-	tLimMlmScanReq *mlm_scan_req;
-	tSirRetStatus status = eSIR_SUCCESS;
-	TX_TIMER *probe_req_timer =
-		&mac_ctx->lim.limTimers.gLimPeriodicProbeReqTimer;
-
-	if (qdf_mc_timer_get_current_state(&probe_req_timer->qdf_timer)
-					   != QDF_TIMER_STATE_STOPPED) {
-		pe_debug("Invalid state of timer");
-		return;
-	}
-
-	if (!((mac_ctx->lim.gLimMlmState == eLIM_MLM_WT_PROBE_RESP_STATE)
-	    && (probe_req_timer->sessionId != 0xff)
-	    && (mac_ctx->lim.probeCounter < mac_ctx->lim.maxProbe))) {
-		pe_debug("received unexpected Periodic scan timeout in state %X",
-			mac_ctx->lim.gLimMlmState);
-		return;
-	}
-
-	mlm_scan_req = mac_ctx->lim.gpLimMlmScanReq;
-	mac_ctx->lim.probeCounter++;
-	/* Periodic channel timer timed out to send probe request. */
-	channel_num = lim_get_current_scan_channel(mac_ctx);
-	do {
-		/*
-		 * Prepare and send Probe Request frame for all the SSIDs
-		 * present in the saved MLM
-		 */
-		status = lim_send_probe_req_mgmt_frame(mac_ctx,
-				&mlm_scan_req->ssId[i], mlm_scan_req->bssId,
-				channel_num, mac_ctx->lim.gSelfMacAddr,
-				mlm_scan_req->dot11mode,
-				mlm_scan_req->uIEFieldLen,
-				(uint8_t *) (mlm_scan_req) +
-					mlm_scan_req->uIEFieldOffset);
-		if (status != eSIR_SUCCESS) {
-			pe_err("send ProbeReq failed for SSID %s on channel: %d",
-				mlm_scan_req->ssId[i].ssId, channel_num);
-			return;
-		}
-		i++;
-	} while (i < mlm_scan_req->numSsid);
-	/* Activate timer again */
-	if (tx_timer_activate(probe_req_timer) != TX_SUCCESS) {
-		pe_warn("could not start periodic probe req timer");
-		return;
-	}
-}
-
 void lim_process_join_failure_timeout(tpAniSirGlobal mac_ctx)
 {
 	tLimMlmJoinCnf mlm_join_cnf;

core/mac/src/pe/lim/lim_process_sme_req_messages.c

@@ -4517,14 +4517,12 @@ bool lim_process_sme_req_messages(tpAniSirGlobal pMac,
 {
 	bool bufConsumed = true;        /* Set this flag to false within case block of any following message, that doesnt want pMsgBuf to be freed. */
 	uint32_t *pMsgBuf = pMsg->bodyptr;
-	tpSirSmeScanReq pScanReq;
 
 	pe_debug("LIM Received SME Message %s(%d) Global LimSmeState:%s(%d) Global LimMlmState: %s(%d)",
 		       lim_msg_str(pMsg->type), pMsg->type,
 		       lim_sme_state_str(pMac->lim.gLimSmeState), pMac->lim.gLimSmeState,
 		       lim_mlm_state_str(pMac->lim.gLimMlmState), pMac->lim.gLimMlmState);
 
-	pScanReq = (tpSirSmeScanReq) pMsgBuf;
 	/* If no insert NOA required then execute the code below */
 
 	switch (pMsg->type) {

core/mac/src/pe/lim/lim_send_management_frames.c

@@ -273,12 +273,8 @@ lim_send_probe_req_mgmt_frame(tpAniSirGlobal mac_ctx,
 	 * sent by P2P Client
 	 */
 	if ((WNI_CFG_DOT11_MODE_11B != dot11mode) && (p2pie != NULL) &&
-	    (((mac_ctx->lim.gpLimMlmScanReq != NULL) &&
-	      mac_ctx->lim.gpLimMlmScanReq->p2pSearch) ||
-	     ((pesession != NULL) &&
-	      (QDF_P2P_CLIENT_MODE == pesession->pePersona))
-	    )
-	   ) {
+	    ((pesession != NULL) &&
+	      (QDF_P2P_CLIENT_MODE == pesession->pePersona))) {
 		/*
 		 * In the below API pass channel number > 14, do that it fills
 		 * only 11a rates in supported rates
@@ -443,17 +439,14 @@ lim_send_probe_req_mgmt_frame(tpAniSirGlobal mac_ctx,
 	/* If this probe request is sent during P2P Search State, then we need
 	 * to send it at OFDM rate.
 	 */
-	if ((BAND_5G == lim_get_rf_band(channel))
-	    || ((mac_ctx->lim.gpLimMlmScanReq != NULL) &&
-		mac_ctx->lim.gpLimMlmScanReq->p2pSearch)
+	if ((BAND_5G == lim_get_rf_band(channel)) ||
 		/*
 		 * For unicast probe req mgmt from Join function we don't set
 		 * above variables. So we need to add one more check whether it
 		 * is pePersona is P2P_CLIENT or not
 		 */
-	    || ((pesession != NULL) &&
-		(QDF_P2P_CLIENT_MODE == pesession->pePersona))
-	    ) {
+	    ((pesession != NULL) &&
+		(QDF_P2P_CLIENT_MODE == pesession->pePersona))) {
 		txflag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
 	}
 

core/mac/src/pe/lim/lim_sme_req_utils.c

@@ -639,79 +639,6 @@ lim_is_sme_deauth_req_valid(tpAniSirGlobal pMac, tpSirSmeDeauthReq pDeauthReq,
 	return true;
 } /*** end lim_is_sme_deauth_req_valid() ***/
 
-/**
- * lim_is_sme_scan_req_valid()
- *
- ***FUNCTION:
- * This function is called by lim_process_sme_req_messages() upon
- * receiving SME_SCAN_REQ message from application.
- *
- ***LOGIC:
- * Message validity checks are performed in this function
- *
- ***ASSUMPTIONS:
- *
- ***NOTE:
- *
- * @param  pScanReq Pointer to received SME_SCAN_REQ message
- * @return true  when received SME_SCAN_REQ is formatted correctly
- *         false otherwise
- */
-
-uint8_t lim_is_sme_scan_req_valid(tpAniSirGlobal pMac, tpSirSmeScanReq pScanReq)
-{
-	uint8_t valid = true;
-	uint8_t i = 0;
-
-	if (pScanReq->numSsid > SIR_SCAN_MAX_NUM_SSID) {
-		valid = false;
-		pe_err("Number of SSIDs > SIR_SCAN_MAX_NUM_SSID");
-		goto end;
-	}
-
-	for (i = 0; i < pScanReq->numSsid; i++) {
-		if (pScanReq->ssId[i].length > SIR_MAC_MAX_SSID_LENGTH) {
-			pe_err("Requested SSID length > SIR_MAC_MAX_SSID_LENGTH");
-			valid = false;
-			goto end;
-		}
-	}
-	if ((pScanReq->bssType < 0) || (pScanReq->bssType > eSIR_AUTO_MODE)) {
-		pe_err("Invalid BSS Type");
-		valid = false;
-	}
-	if (qdf_is_macaddr_group(&pScanReq->bssId) &&
-		!qdf_is_macaddr_broadcast(&pScanReq->bssId)) {
-		valid = false;
-		pe_err("BSSID is group addr and is not Broadcast Addr");
-	}
-	if (!
-	    (pScanReq->scanType == eSIR_PASSIVE_SCAN
-	     || pScanReq->scanType == eSIR_ACTIVE_SCAN)) {
-		valid = false;
-		pe_err("Invalid Scan Type");
-	}
-	if (pScanReq->channelList.numChannels > SIR_MAX_NUM_CHANNELS) {
-		valid = false;
-		pe_err("Number of Channels > SIR_MAX_NUM_CHANNELS");
-	}
-
-	/*
-	** check min/max channelTime range
-	**/
-	if (valid) {
-		if ((pScanReq->scanType == eSIR_ACTIVE_SCAN) &&
-		    (pScanReq->maxChannelTime < pScanReq->minChannelTime)) {
-			pe_err("Max Channel Time < Min Channel Time");
-			valid = false;
-			goto end;
-		}
-	}
-
-end:
-	return valid;
-} /*** end lim_is_sme_scan_req_valid() ***/
-
 /**
  * lim_is_sme_set_context_req_valid()
  *

core/mac/src/pe/lim/lim_sme_req_utils.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2012,2014-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2012,2014-2015,2018 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -45,7 +45,6 @@
 uint8_t lim_is_sme_start_bss_req_valid(tpAniSirGlobal, tpSirSmeStartBssReq);
 uint8_t lim_set_rs_nie_wp_aiefrom_sme_start_bss_req_message(tpAniSirGlobal,
 							    tpSirRSNie, tpPESession);
-uint8_t lim_is_sme_scan_req_valid(tpAniSirGlobal, tpSirSmeScanReq);
 uint8_t lim_is_sme_join_req_valid(tpAniSirGlobal, tpSirSmeJoinReq);
 uint8_t lim_is_sme_disassoc_req_valid(tpAniSirGlobal, tpSirSmeDisassocReq,
 				      tpPESession);

core/mac/src/pe/lim/lim_timer_utils.c

@@ -248,16 +248,6 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac)
 	 * timer expires
 	 */
 	cfgValue1 = cfgValue / 2;
-	/* Create periodic probe request timer and activate them later */
-	if (cfgValue1 >= 1
-	    && (tx_timer_create(pMac,
-			&pMac->lim.limTimers.gLimPeriodicProbeReqTimer,
-			"Periodic Probe Request Timer", lim_timer_handler,
-			SIR_LIM_PERIODIC_PROBE_REQ_TIMEOUT, cfgValue1, 0,
-			TX_NO_ACTIVATE) != TX_SUCCESS)) {
-		pe_err("could not create periodic probe timer");
-		goto err_timer;
-	}
 
 	if (wlan_cfg_get_int(pMac, WNI_CFG_ACTIVE_MAXIMUM_CHANNEL_TIME,
 			     &cfgValue) != eSIR_SUCCESS)
@@ -396,7 +386,6 @@ err_timer:
 	tx_timer_delete(&pMac->lim.limTimers.gLimQuietBssTimer);
 	tx_timer_delete(&pMac->lim.limTimers.gLimQuietTimer);
 	tx_timer_delete(&pMac->lim.limTimers.gLimChannelSwitchTimer);
-	tx_timer_delete(&pMac->lim.limTimers.gLimPeriodicProbeReqTimer);
 	tx_timer_delete(&pMac->lim.limTimers.gLimP2pSingleShotNoaInsertTimer);
 	tx_timer_delete(&pMac->lim.limTimers.gLimActiveToPassiveChannelTimer);
 	tx_timer_delete(&pMac->lim.limTimers.sae_auth_timer);
@@ -648,35 +637,6 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
 		}
 		break;
 
-	case eLIM_PERIODIC_PROBE_REQ_TIMER:
-		if (tx_timer_deactivate
-			    (&pMac->lim.limTimers.gLimPeriodicProbeReqTimer)
-		    != TX_SUCCESS) {
-			/* Could not deactivate min channel timer. */
-			/* Log error */
-			pe_err("Unable to deactivate periodic timer");
-		}
-
-		val =
-			SYS_MS_TO_TICKS(pMac->lim.gpLimMlmScanReq->minChannelTime) /
-			2;
-		if (val) {
-			if (tx_timer_change(
-			    &pMac->lim.limTimers.gLimPeriodicProbeReqTimer,
-			    val, 0) != TX_SUCCESS) {
-				/* Could not change min channel timer. */
-				/* Log error */
-				pe_err("Unable to change periodic timer");
-			}
-		} else
-			pe_err("Do not change gLimPeriodicProbeReqTimer values,"
-			       "value: %d minchannel time: %d"
-			       "maxchannel time: %d", val,
-			       pMac->lim.gpLimMlmScanReq->minChannelTime,
-			       pMac->lim.gpLimMlmScanReq->maxChannelTime);
-
-		break;
-
 	case eLIM_JOIN_FAIL_TIMER:
 		if (tx_timer_deactivate
 			    (&pMac->lim.limTimers.gLimJoinFailureTimer)

core/mac/src/pe/lim/lim_timer_utils.h

@@ -62,7 +62,6 @@ enum {
 	eLIM_WPS_OVERLAP_TIMER,
 	eLIM_FT_PREAUTH_RSP_TIMER,
 	eLIM_REMAIN_CHN_TIMER,
-	eLIM_PERIODIC_PROBE_REQ_TIMER,
 	eLIM_DISASSOC_ACK_TIMER,
 	eLIM_DEAUTH_ACK_TIMER,
 	eLIM_PERIODIC_JOIN_PROBE_REQ_TIMER,

core/mac/src/pe/lim/lim_trace.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2018 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -73,7 +73,6 @@ static uint8_t *__lim_trace_get_timer_string(uint16_t timerId)
 		CASE_RETURN_STRING(eLIM_WPS_OVERLAP_TIMER);
 		CASE_RETURN_STRING(eLIM_FT_PREAUTH_RSP_TIMER);
 		CASE_RETURN_STRING(eLIM_REMAIN_CHN_TIMER);
-		CASE_RETURN_STRING(eLIM_PERIODIC_PROBE_REQ_TIMER);
 		CASE_RETURN_STRING(eLIM_DISASSOC_ACK_TIMER);
 		CASE_RETURN_STRING(eLIM_DEAUTH_ACK_TIMER);
 		CASE_RETURN_STRING(eLIM_PERIODIC_JOIN_PROBE_REQ_TIMER);

core/mac/src/pe/lim/lim_types.h

@@ -856,34 +856,6 @@ lim_post_mlm_message(tpAniSirGlobal pMac, uint32_t msgType, uint32_t *pMsgBuf)
 	lim_process_mlm_req_messages(pMac, &msg);
 } /*** end lim_post_mlm_message() ***/
 
-/**
- * lim_get_current_scan_channel()
- *
- ***FUNCTION:
- * This function is called in various places to get current channel
- * number being scanned.
- *
- ***PARAMS:
- *
- ***LOGIC:
- *
- ***ASSUMPTIONS:
- * NA
- *
- ***NOTE:
- * NA
- *
- * @param  pMac      Pointer to Global MAC structure
- * @return Channel number
- */
-static inline uint8_t lim_get_current_scan_channel(tpAniSirGlobal pMac)
-{
-	uint8_t *pChanNum =
-		pMac->lim.gpLimMlmScanReq->channelList.channelNumber;
-
-	return *(pChanNum + pMac->lim.gLimCurrentScanChannelId);
-} /*** end lim_get_current_scan_channel() ***/
-
 /**
  * lim_get_ielen_from_bss_description()
  *

core/mac/src/pe/lim/lim_utils.c

@@ -547,9 +547,6 @@ void lim_deactivate_timers(tpAniSirGlobal mac_ctx)
 
 	lim_deactivate_timers_host_roam(mac_ctx);
 
-	/* Deactivate Periodic Probe channel timers. */
-	tx_timer_deactivate(&lim_timer->gLimPeriodicProbeReqTimer);
-
 	/* Deactivate channel switch timer. */
 	tx_timer_deactivate(&lim_timer->gLimChannelSwitchTimer);
 
@@ -643,9 +640,6 @@ void lim_cleanup_mlm(tpAniSirGlobal mac_ctx)
 		lim_deactivate_timers(mac_ctx);
 
 		lim_delete_timers_host_roam(mac_ctx);
-		/* Delete Periodic Probe channel timers. */
-		tx_timer_delete(&lim_timer->gLimPeriodicProbeReqTimer);
-
 		/* Delete channel switch timer. */
 		tx_timer_delete(&lim_timer->gLimChannelSwitchTimer);
 
@@ -6788,23 +6782,6 @@ lim_get_80Mhz_center_channel(uint8_t primary_channel)
 	return INVALID_CHANNEL_ID;
 }
 
-/**
- * lim_scan_type_to_string(): converts scan type enum to string.
- * @scan_type: enum value of scan_type.
- *
- * Return: Printable string for scan_type
- */
-const char *lim_scan_type_to_string(const uint8_t scan_type)
-{
-	switch (scan_type) {
-	CASE_RETURN_STRING(eSIR_PASSIVE_SCAN);
-	CASE_RETURN_STRING(eSIR_ACTIVE_SCAN);
-	CASE_RETURN_STRING(eSIR_BEACON_TABLE);
-	default:
-		return "Unknown scan_type";
-	}
-}
-
 /**
  * lim_bss_type_to_string(): converts bss type enum to string.
  * @bss_type: enum value of bss_type.

core/mac/src/sys/legacy/src/utils/src/mac_trace.c

@@ -714,7 +714,6 @@ uint8_t *mac_trace_get_lim_msg_string(uint16_t lim_msg)
 		CASE_RETURN_STRING(SIR_LIM_INSERT_SINGLESHOT_NOA_TIMEOUT);
 		CASE_RETURN_STRING(SIR_LIM_CONVERT_ACTIVE_CHANNEL_TO_PASSIVE);
 		CASE_RETURN_STRING(SIR_LIM_BEACON_GEN_IND);
-		CASE_RETURN_STRING(SIR_LIM_PERIODIC_PROBE_REQ_TIMEOUT);
 		CASE_RETURN_STRING(SIR_LIM_DISASSOC_ACK_TIMEOUT);
 		CASE_RETURN_STRING(SIR_LIM_DEAUTH_ACK_TIMEOUT);
 		CASE_RETURN_STRING(SIR_LIM_PERIODIC_JOIN_PROBE_REQ_TIMEOUT);

core/sme/inc/csr_api.h

@@ -164,22 +164,6 @@ typedef enum {
 	eCSR_BSS_TYPE_ANY,
 } eCsrRoamBssType;
 
-typedef enum {
-	eCSR_SCAN_REQUEST_11D_SCAN = 1,
-	eCSR_SCAN_REQUEST_FULL_SCAN,
-	eCSR_SCAN_IDLE_MODE_SCAN,
-	eCSR_SCAN_HO_PROBE_SCAN, /* direct probe on entry from candidate list */
-	eCSR_SCAN_P2P_DISCOVERY,
-
-	eCSR_SCAN_SOFTAP_CHANNEL_RANGE,
-	eCSR_SCAN_P2P_FIND_PEER,
-} eCsrRequestType;
-
-typedef enum {
-	eCSR_SCAN_RESULT_GET = 0,
-	eCSR_SCAN_RESULT_FLUSH = 1, /* to delete all cached scan results */
-} eCsrScanResultCmd;
-
 typedef enum {
 	eCSR_SCAN_SUCCESS,
 	eCSR_SCAN_FAILURE,
@@ -187,17 +171,6 @@ typedef enum {
 	eCSR_SCAN_FOUND_PEER,
 } eCsrScanStatus;
 
-/*
- * Reason to abort the scan
- * The reason can used later to decide whether to update the scan results
- * to upper layer or not
- */
-typedef enum {
-	eCSR_SCAN_ABORT_DEFAULT = 1,
-	eCSR_SCAN_ABORT_DUE_TO_BAND_CHANGE, /* Scan abort due to band change */
-	eCSR_SCAN_ABORT_SSID_ONLY
-} eCsrAbortReason;
-
 typedef enum {
 	eCSR_BW_20MHz_VAL = 20,
 	eCSR_BW_40MHz_VAL = 40,
@@ -288,31 +261,6 @@ typedef struct tagCsrStaParams {
 	uint8_t supported_oper_classes[REG_MAX_SUPP_OPER_CLASSES];
 } tCsrStaParams;
 
-typedef struct tagCsrScanRequest {
-	tSirScanType scanType;
-	struct qdf_mac_addr bssid;
-	eCsrRoamBssType BSSType;
-	tCsrSSIDs SSIDs;
-	tCsrChannelInfo ChannelInfo;
-	uint32_t minChnTime;    /* in units of milliseconds */
-	uint32_t maxChnTime;    /* in units of milliseconds */
-	/* In units of milliseconds, ignored when not connected */
-	uint32_t restTime;
-	/* In units of milliseconds, ignored when not connected */
-	uint32_t min_rest_time;
-	/* In units of milliseconds, ignored when not connected */
-	uint32_t idle_time;
-	uint32_t uIEFieldLen;
-	uint8_t *pIEField;
-	enum wmi_dwelltime_adaptive_mode scan_adaptive_dwell_mode;
-	eCsrRequestType requestType; /* 11d scan or full scan */
-	bool p2pSearch;
-	bool skipDfsChnlInP2pSearch;
-	bool bcnRptReqScan;     /* is Scan issued by Beacon Report Request */
-	uint32_t scan_id;
-	uint32_t timestamp;
-} tCsrScanRequest;
-
 typedef struct tagCsrScanResultInfo {
 	/*
 	 * Carry the IEs for the current BSSDescription.

core/sme/inc/csr_internal.h

@@ -324,24 +324,6 @@ struct csr_roamstart_bssparams {
 	uint32_t dfs_regdomain;
 };
 
-struct scan_cmd {
-	uint32_t scanID;
-	csr_scan_completeCallback callback;
-	void *pContext;
-	eCsrScanStatus status;
-	enum csr_roam_state lastRoamState[CSR_ROAM_SESSION_MAX];
-	tCsrRoamProfile *pToRoamProfile;
-	/* this is the ID related to the pToRoamProfile */
-	uint32_t roamId;
-	union {
-		tCsrScanRequest scanRequest;
-		/* tCsrBGScanRequest bgScanRequest is no longer used */
-	} u;
-	/* This flag will be set while aborting the scan due to band change */
-	eCsrAbortReason        abort_scan_indication;
-	qdf_mc_timer_t csr_scan_timer;
-};
-
 struct roam_cmd {
 	uint32_t roamId;
 	enum csr_roam_reason roamReason;

core/sme/inc/sme_api.h

@@ -844,7 +844,6 @@ QDF_STATUS sme_modify_add_ie(tHalHandle hHal,
 QDF_STATUS sme_update_add_ie(tHalHandle hHal,
 		tSirUpdateIE *pUpdateIE, eUpdateIEsType updateType);
 QDF_STATUS sme_update_connect_debug(tHalHandle hHal, uint32_t set_value);
-const char *sme_scan_type_to_string(const uint8_t scan_type);
 const char *sme_bss_type_to_string(const uint8_t bss_type);
 QDF_STATUS sme_ap_disable_intra_bss_fwd(tHalHandle hHal, uint8_t sessionId,
 		bool disablefwd);

core/sme/inc/sme_inside.h

@@ -169,7 +169,6 @@ typedef struct tagSmeCmd {
 	eSmeCommandType command;
 	uint32_t sessionId;
 	union {
-		struct scan_cmd scanCmd;
 		struct roam_cmd roamCmd;
 		struct wmstatus_changecmd wmStatusChangeCmd;
 		tGenericPmcCmd pmcCmd;

core/sme/inc/sme_internal.h

@@ -56,7 +56,6 @@ typedef enum eSmeCommandType {
 	eSmeDropCommand,
 	/* this is not a command, it is to identify this is a CSR command */
 	eSmeCsrCommandMask = 0x10000,
-	eSmeCommandScan,
 	eSmeCommandRoam,
 	eSmeCommandWmStatusChange,
 #ifdef FEATURE_WLAN_TDLS
@@ -238,7 +237,6 @@ typedef struct tagSmeStruct {
 	void *dcc_stats_event_context;
 	ocb_callback dcc_stats_event_callback;
 	sme_set_thermal_level_callback set_thermal_level_cb;
-	void *saved_scan_cmd;
 	void *bpf_get_offload_context;
 	bpf_get_offload_cb bpf_get_offload_cb;
 	p2p_lo_callback p2p_lo_event_callback;

core/sme/src/csr/csr_api_roam.c

@@ -510,7 +510,6 @@ static void csr_assoc_rej_free_rssi_disallow_list(qdf_list_t *list)
 QDF_STATUS csr_close(tpAniSirGlobal pMac)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
-	tSmeCmd *saved_scan_cmd;
 
 	csr_roam_close(pMac);
 	csr_assoc_rej_free_rssi_disallow_list(
@@ -518,27 +517,6 @@ QDF_STATUS csr_close(tpAniSirGlobal pMac)
 	csr_scan_close(pMac);
 	csr_ll_close(&pMac->roam.statsClientReqList);
 	csr_ll_close(&pMac->roam.peStatsReqList);
-	saved_scan_cmd = (tSmeCmd *)pMac->sme.saved_scan_cmd;
-	if (saved_scan_cmd) {
-		csr_release_profile(pMac, saved_scan_cmd->u.scanCmd.
-				    pToRoamProfile);
-		if (saved_scan_cmd->u.scanCmd.pToRoamProfile) {
-			qdf_mem_free(saved_scan_cmd->u.scanCmd.pToRoamProfile);
-			saved_scan_cmd->u.scanCmd.pToRoamProfile = NULL;
-		}
-		if (saved_scan_cmd->u.scanCmd.u.scanRequest.SSIDs.SSIDList) {
-			qdf_mem_free(saved_scan_cmd->u.scanCmd.u.scanRequest.
-				     SSIDs.SSIDList);
-			saved_scan_cmd->u.scanCmd.u.scanRequest.SSIDs.
-				SSIDList = NULL;
-		}
-		if (saved_scan_cmd->u.roamCmd.pRoamBssEntry) {
-			qdf_mem_free(saved_scan_cmd->u.roamCmd.pRoamBssEntry);
-			saved_scan_cmd->u.roamCmd.pRoamBssEntry = NULL;
-		}
-		qdf_mem_free(saved_scan_cmd);
-		saved_scan_cmd = NULL;
-	}
 	/* DeInit Globals */
 	csr_roam_de_init_globals(pMac);
 	return status;
@@ -6873,7 +6851,7 @@ static void csr_roam_process_results_default(tpAniSirGlobal mac_ctx,
 			 * else case by sending assoc failure
 			 */
 			csr_roam_call_callback(mac_ctx, session_id,
-				&roam_info, cmd->u.scanCmd.roamId,
+				&roam_info, cmd->u.roamCmd.roamId,
 				eCSR_ROAM_ASSOCIATION_FAILURE,
 				eCSR_ROAM_RESULT_FAILURE);
 		}

core/sme/src/csr/csr_inside_api.h

@@ -255,11 +255,6 @@ QDF_STATUS csr_scan_open(tpAniSirGlobal pMac);
 QDF_STATUS csr_scan_close(tpAniSirGlobal pMac);
 bool csr_scan_append_bss_description(tpAniSirGlobal pMac,
 				     tSirBssDescription *pSirBssDescription);
-void csr_scan_call_callback(tpAniSirGlobal pMac, tSmeCmd *pCommand,
-			    eCsrScanStatus scanStatus);
-QDF_STATUS csr_scan_copy_request(tpAniSirGlobal pMac, tCsrScanRequest *pDstReq,
-				 tCsrScanRequest *pSrcReq);
-QDF_STATUS csr_scan_free_request(tpAniSirGlobal pMac, tCsrScanRequest *pReq);
 QDF_STATUS csr_scan_for_ssid(tpAniSirGlobal pMac, uint32_t sessionId,
 			     tCsrRoamProfile *pProfile, uint32_t roamId,
 			     bool notify);
@@ -455,19 +450,6 @@ QDF_STATUS csr_roam_get_session_id_from_bssid(tpAniSirGlobal pMac,
 enum csr_cfgdot11mode csr_find_best_phy_mode(tpAniSirGlobal pMac,
 							uint32_t phyMode);
 
-/*
- * csr_scan_request() -
- * Request a 11d or full scan.
- *
- * callback - a callback function that scan calls upon finish, will not be
- * called if csr_scan_request returns error
- * pContext - a pointer passed in for the callback
- * Return QDF_STATUS
- */
-QDF_STATUS csr_scan_request(tpAniSirGlobal pMac, uint16_t sessionId,
-			tCsrScanRequest *scan_req,
-			csr_scan_completeCallback callback, void *pContext);
-
 /*
  * csr_scan_get_result() -
  * Return scan results.

core/sme/src/csr/csr_util.c

@@ -6418,23 +6418,6 @@ const char *sme_bss_type_to_string(const uint8_t bss_type)
 	}
 }
 
-/**
- * sme_scantype_to_string() - converts scan type to string.
- * @scan_type: scan type enum
- *
- * Return: printable string for scan type
- */
-const char *sme_scan_type_to_string(const uint8_t scan_type)
-{
-	switch (scan_type) {
-	CASE_RETURN_STRING(eSIR_PASSIVE_SCAN);
-	CASE_RETURN_STRING(eSIR_ACTIVE_SCAN);
-	CASE_RETURN_STRING(eSIR_BEACON_TABLE);
-	default:
-		return "unknown scan type";
-	}
-}
-
 QDF_STATUS csr_add_to_channel_list_front(uint8_t *pChannelList,
 					 int numChannels, uint8_t channel)
 {

core/wma/inc/wma_internal.h

@@ -236,15 +236,6 @@ int wma_roam_synch_frame_event_handler(void *handle, uint8_t *event,
 void wma_update_per_roam_config(WMA_HANDLE handle,
 				 struct wmi_per_roam_config_req *req_buf);
 
-QDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle,
-				      tSirScanOffloadReq *scan_req,
-				      struct scan_req_params *cmd);
-
-QDF_STATUS wma_get_buf_stop_scan_cmd(tp_wma_handle wma_handle,
-				     wmi_buf_t *buf,
-				     int *buf_len,
-				     tAbortScanParams *abort_scan_req);
-
 QDF_STATUS wma_update_channel_list(WMA_HANDLE handle,
 				   tSirUpdateChanList *chan_list);