Prechádzať zdrojové kódy

qcacld-3.0: Remove unused params of struct csr_roam_info

Remove unused params of struct csr_roam_info.

Change-Id: I90aeafc9618ca9569769b7d708d4b552c5ef93ae
CRs-Fixed: 2981156
Abhishek Singh 3 rokov pred
rodič
commit
a651b893b9

+ 0 - 4
core/hdd/src/wlan_hdd_assoc.c

@@ -2130,10 +2130,6 @@ hdd_sme_roam_callback(void *context, struct csr_roam_info *roam_info,
 			hdd_debug("set key complete, session: %d",
 				  adapter->vdev_id);
 	}
-#ifdef WLAN_FEATURE_ROAM_OFFLOAD
-		if (roam_info)
-			roam_info->roamSynchInProgress = false;
-#endif
 		break;
 	case eCSR_ROAM_UNPROT_MGMT_FRAME_IND:
 		if (roam_info)

+ 0 - 7
core/mac/inc/sir_api.h

@@ -2266,13 +2266,6 @@ typedef struct sSirSmeDfsChannelList {
 	uint8_t channels[SIR_DFS_MAX_20M_SUB_CH];
 } tSirSmeDfsChannelList, *tpSirSmeDfsChannelList;
 
-typedef struct sSirSmeDfsEventInd {
-	uint32_t sessionId;
-	tSirSmeDfsChannelList chan_list;
-	uint32_t dfs_radar_status;
-	int use_nol;
-} tSirSmeDfsEventInd, *tpSirSmeDfsEventInd;
-
 typedef struct sSirChanChangeRequest {
 	uint16_t messageType;
 	uint16_t messageLen;

+ 0 - 52
core/sme/inc/csr_api.h

@@ -638,10 +638,6 @@ struct csr_config_params {
 #endif
 
 struct csr_roam_info {
-	struct csr_roam_profile *pProfile;
-	uint32_t nBeaconLength;
-	uint32_t nAssocReqLength;
-	uint32_t nAssocRspLength;
 	uint32_t nFrameLength;
 	uint8_t frameType;
 	/*
@@ -651,7 +647,6 @@ struct csr_roam_info {
 	 */
 	uint8_t *pbFrames;
 	bool fReassocReq;       /* set to true if for re-association */
-	bool fReassocRsp;       /* set to true if for re-association */
 	struct qdf_mac_addr bssid;
 	struct qdf_mac_addr peerMac;
 	tSirResultCodes status_code;
@@ -663,7 +658,6 @@ struct csr_roam_info {
 	uint8_t staId;         /* Peer stationId when connected */
 	/* false means auth needed from supplicant. true means authenticated */
 	bool fAuthRequired;
-	uint8_t sessionId;
 	uint8_t rsnIELen;
 	uint8_t *prsnIE;
 	uint8_t wapiIELen;
@@ -676,46 +670,17 @@ struct csr_roam_info {
 		tSirWPSPBCProbeReq *pWPSPBCProbeReq;
 	} u;
 	bool wmmEnabledSta;  /* set to true if WMM enabled STA */
-	uint32_t dtimPeriod;
 #ifdef FEATURE_WLAN_ESE
-	bool isESEAssoc;
 	struct tsm_ie tsm_ie;
-	uint32_t timestamp[2];
 	uint16_t tsmRoamDelay;
 	struct ese_bcn_report_rsp *pEseBcnReportRsp;
-#endif
-#ifdef FEATURE_WLAN_TDLS
-	/*
-	 * TDLS parameters to check whether TDLS
-	 * and TDLS channel switch is allowed in the
-	 * AP network
-	 */
-	bool tdls_prohibited;           /* per ExtCap in Assoc/Reassoc resp */
-	bool tdls_chan_swit_prohibited; /* per ExtCap in Assoc/Reassoc resp */
 #endif
 	/* Required for indicating the frames to upper layer */
 	uint32_t assocReqLength;
 	uint8_t *assocReqPtr;
-	int8_t rxRssi;
-	tSirSmeDfsEventInd dfs_event;
 	tSirChanChangeResponse *channelChangeRespEvent;
 	/* Timing and fine Timing measurement capability clubbed together */
 	uint8_t timingMeasCap;
-#ifdef WLAN_FEATURE_ROAM_OFFLOAD
-	uint8_t roamSynchInProgress;
-	uint8_t synchAuthStatus;
-	uint8_t kck[MAX_KCK_LEN];
-	uint8_t kck_len;
-	uint8_t kek[MAX_KEK_LENGTH];
-	uint8_t kek_len;
-	uint32_t pmk_len;
-	uint8_t pmk[MAX_PMK_LEN];
-	uint8_t pmkid[PMKID_LEN];
-	bool update_erp_next_seq_num;
-	uint16_t next_erp_seq_num;
-	uint8_t replay_ctr[REPLAY_CTR_LEN];
-	uint8_t subnet_change_status;
-#endif
 	struct oem_channel_info chan_info;
 	uint32_t target_chan_freq;
 
@@ -728,13 +693,6 @@ struct csr_roam_info {
 	tDot11fIEHTCaps ht_caps;
 	tDot11fIEVHTCaps vht_caps;
 	bool he_caps_present;
-	tDot11fIEhs20vendor_ie hs20vendor_ie;
-	tDot11fIEVHTOperation vht_operation;
-	tDot11fIEHTInfo ht_operation;
-#ifdef WLAN_FEATURE_11AX
-	tDot11fIEhe_op he_operation;
-#endif
-	bool reassoc;
 	bool ampdu;
 	bool sgi_enable;
 	bool tx_stbc;
@@ -748,11 +706,6 @@ struct csr_roam_info {
 	uint8_t tx_mcs_map;
 	/* Extended capabilities of STA */
 	uint8_t ecsa_capable;
-	bool is_fils_connection;
-#ifdef WLAN_FEATURE_FILS_SK
-	uint16_t fils_seq_num;
-	struct fils_join_rsp_params *fils_join_rsp;
-#endif
 	int rssi;
 	int tx_rate;
 	int rx_rate;
@@ -763,11 +716,6 @@ struct csr_roam_info {
 	struct sir_sae_info *sae_info;
 #endif
 	struct assoc_ind *owe_pending_assoc_ind;
-	uint16_t roam_reason;
-	struct element_info *disconnect_ies;
-#ifdef WLAN_FEATURE_11BE
-	tDot11fIEeht_op eht_operation;
-#endif
 };
 
 typedef struct sSirSmeAssocIndToUpperLayerCnf {

+ 0 - 29
core/sme/inc/sme_api.h

@@ -2160,20 +2160,6 @@ QDF_STATUS sme_set_cts2self_for_p2p_go(mac_handle_t mac_handle);
 QDF_STATUS sme_update_tx_fail_cnt_threshold(mac_handle_t mac_handle,
 		uint8_t session_id, uint32_t tx_fail_count);
 
-/**
- * sme_roam_is_ese_assoc() - Check if association type is ESE
- * @roam_info: Pointer to roam info
- *
- * Return: true if ESE Association, false otherwise.
- */
-#ifdef FEATURE_WLAN_ESE
-bool sme_roam_is_ese_assoc(struct csr_roam_info *roam_info);
-#else
-static inline bool sme_roam_is_ese_assoc(struct csr_roam_info *roam_info)
-{
-	return false;
-}
-#endif
 /**
  * sme_neighbor_roam_is11r_assoc() - Check if association type is 11R
  * @mac_handle: MAC_HANDLE handle
@@ -2717,21 +2703,6 @@ void sme_send_hlp_ie_info(mac_handle_t mac_handle, uint8_t vdev_id,
 QDF_STATUS sme_send_rso_connect_params(mac_handle_t mac_handle,
 				       uint8_t vdev_id);
 
-#if defined(WLAN_FEATURE_FILS_SK)
-/**
- * sme_free_join_rsp_fils_params - free fils params
- * @roam_info: roam info
- *
- * Return: void
- */
-void sme_free_join_rsp_fils_params(struct csr_roam_info *roam_info);
-#else
-static inline
-void sme_free_join_rsp_fils_params(struct csr_roam_info *roam_info)
-{}
-
-#endif
-
 #ifdef WLAN_FEATURE_11AX_BSS_COLOR
 /**
  * sme_set_he_bss_color() - Sets the HE BSS color

+ 0 - 27
core/sme/src/common/sme_api.c

@@ -1337,7 +1337,6 @@ QDF_STATUS sme_update_new_channel_event(mac_handle_t mac_handle,
 	if (!roamInfo)
 		return QDF_STATUS_E_FAILURE;
 
-	roamInfo->dfs_event.sessionId = session_id;
 	roamStatus = eCSR_ROAM_CHANNEL_COMPLETE_IND;
 	roamResult = eCSR_ROAM_RESULT_DFS_RADAR_FOUND_IND;
 	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
@@ -6113,25 +6112,6 @@ void sme_send_hlp_ie_info(mac_handle_t mac_handle, uint8_t vdev_id,
 	sme_release_global_lock(&mac->sme);
 }
 
-void sme_free_join_rsp_fils_params(struct csr_roam_info *roam_info)
-{
-	struct fils_join_rsp_params *roam_fils_params;
-
-	if (!roam_info)
-		return;
-
-	roam_fils_params = roam_info->fils_join_rsp;
-	if (!roam_fils_params)
-		return;
-
-	if (roam_fils_params->fils_pmk)
-		qdf_mem_free(roam_fils_params->fils_pmk);
-
-	qdf_mem_free(roam_fils_params);
-
-	roam_info->fils_join_rsp = NULL;
-}
-
 #else
 inline void sme_send_hlp_ie_info(mac_handle_t mac_handle, uint8_t vdev_id,
 			  struct csr_roam_profile *profile, uint32_t if_addr)
@@ -13018,13 +12998,6 @@ QDF_STATUS sme_set_lost_link_info_cb(mac_handle_t mac_handle,
 	return status;
 }
 
-#ifdef FEATURE_WLAN_ESE
-bool sme_roam_is_ese_assoc(struct csr_roam_info *roam_info)
-{
-	return roam_info->isESEAssoc;
-}
-#endif
-
 bool sme_neighbor_roam_is11r_assoc(mac_handle_t mac_handle, uint8_t session_id)
 {
 	struct mac_context *mac_ctx = MAC_CONTEXT(mac_handle);

+ 0 - 3
core/sme/src/csr/csr_api_roam.c

@@ -2081,8 +2081,6 @@ QDF_STATUS csr_roam_call_callback(struct mac_context *mac, uint32_t sessionId,
 	chan_freq = wlan_get_operation_chan_freq_vdev_id(mac->pdev, sessionId);
 
 	if (mac->session_roam_complete_cb) {
-		if (roam_info)
-			roam_info->sessionId = (uint8_t) sessionId;
 		status = mac->session_roam_complete_cb(mac->psoc, sessionId, roam_info,
 						       roamId, u1, u2);
 	}
@@ -5028,7 +5026,6 @@ csr_roam_chk_lnk_max_assoc_exceeded(struct mac_context *mac_ctx, tSirSmeRsp *msg
 	sme_debug(
 		"max assoc have been reached, new peer cannot be accepted");
 	sessionId = pSmeMaxAssocInd->sessionId;
-	roam_info->sessionId = sessionId;
 	qdf_copy_macaddr(&roam_info->peerMac, &pSmeMaxAssocInd->peer_mac);
 	csr_roam_call_callback(mac_ctx, sessionId, roam_info, 0,
 			       eCSR_ROAM_INFRA_IND,