qcacld-3.0: Remove unused structures from for set keys

Remove unused structures from wma_if.h and ani_sysytem_defs.h
for set key.

Change-Id: I68aff20694a4fc45fa61071bbc2ef4289351e9a9
CRs-Fixed: 3549004

core/mac/inc/ani_global.h

@@ -306,28 +306,6 @@ struct lim_context {
 	/* ////////////////////////////////////     TIMER RELATED END /////////////////////////////////////////// */
 
 	uint8_t gLimCurrentBssUapsd;
-
-	/* */
-	/* Store the BSS Index returned by HAL during */
-	/* WMA_ADD_BSS_RSP here. */
-	/* */
-
-	/* For now: */
-	/* This will be used during WMA_SET_BSSKEY_REQ in */
-	/* order to set the GTK */
-	/* Later: */
-	/* There could be other interfaces needing this info */
-	/* */
-
-	/* */
-	/* Due to the asynchronous nature of the interface */
-	/* between PE <-> HAL, some transient information */
-	/* like this needs to be cached. */
-	/* This is cached upon receipt of eWNI_SME_SETCONTEXT_REQ. */
-	/* This is released while posting LIM_MLM_SETKEYS_CNF */
-	/* */
-	void *gpLimMlmSetKeysReq;
-
 	/* ////////////////////////////////////////     BSS RELATED END /////////////////////////////////////////// */
 
 	/* ////////////////////////////////////////     STATS/COUNTER RELATED START /////////////////////////////////////////// */

core/mac/inc/ani_system_defs.h

@@ -116,16 +116,6 @@ typedef enum eAniEdType {
 	eSIR_ED_NOT_IMPLEMENTED = SIR_MAX_ENUM_SIZE
 } tAniEdType;
 
-/* / Enum to specify whether key is used */
-/* / for TX only, RX only or both */
-typedef enum eAniKeyDirection {
-	eSIR_TX_ONLY,
-	eSIR_RX_ONLY,
-	eSIR_TX_RX,
-	eSIR_TX_DEFAULT,
-	eSIR_DONOT_USE_KEY_DIRECTION = SIR_MAX_ENUM_SIZE
-} tAniKeyDirection;
-
 typedef struct sAniSSID {
 	uint8_t length;
 	uint8_t ssId[WLAN_SSID_MAX_LEN];
@@ -150,23 +140,6 @@ typedef struct sSirAddie {
 	uint8_t addIEdata[SIR_MAC_MAX_ADD_IE_LENGTH + 2];
 } tSirAddie, *tpSirAddie;
 
-/* / Definition for Encryption Keys */
-typedef struct sSirKeys {
-	uint8_t keyId;
-	uint8_t unicast;        /* 0 for multicast */
-	uint16_t keyLength;
-	uint8_t key[SIR_MAC_MAX_KEY_LENGTH];
-} tSirKeys;
-
-/* / Definition for Keying material */
-typedef struct sSirKeyMaterial {
-	uint16_t length;        /* This is the length of all */
-	/* data that follows */
-	tAniEdType edType;      /* Encryption/Decryption type */
-	uint8_t numKeys;
-	tSirKeys key[1];
-} tSirKeyMaterial, *tpSirKeyMaterial;
-
 #define SIR_CIPHER_SEQ_CTR_SIZE 6
 /* / Definition for MIC failure indication */
 typedef struct sSirMicFailureInfo {
@@ -182,11 +155,6 @@ typedef struct sSirMicFailureInfo {
 } tSirMicFailureInfo, *tpSirMicFailureInfo;
 
 typedef struct sTrafStrmMetrics {
-	uint16_t UplinkPktQueueDly;
-	uint16_t UplinkPktQueueDlyHist[4];
-	uint32_t UplinkPktTxDly;
-	uint16_t UplinkPktLoss;
-	uint16_t UplinkPktCount;
 	uint8_t RoamingCount;
 	uint16_t RoamingDly;
 } qdf_packed tTrafStrmMetrics, *tpTrafStrmMetrics;

core/mac/inc/sir_mac_prot_def.h

@@ -240,7 +240,6 @@
 
 /* / Protocol defined MAX definitions */
 #define SIR_MAC_MAX_NUMBER_OF_RATES          12
-#define SIR_MAC_MAX_NUM_OF_DEFAULT_KEYS      4
 #define SIR_MAC_KEY_LENGTH                   13 /* WEP Maximum key length size */
 #define SIR_MAC_AUTH_CHALLENGE_LENGTH        253
 #define SIR_MAC_SAP_AUTH_CHALLENGE_LENGTH    128

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

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. 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
@@ -83,7 +83,6 @@ typedef struct sSirFTUpdateKeyInfo {
 	uint16_t length;
 	uint32_t vdev_id;
 	struct qdf_mac_addr bssid;
-	tSirKeyMaterial keyMaterial;
 } tSirFTUpdateKeyInfo, *tpSirFTUpdateKeyInfo;
 
 /*-------------------------------------------------------------------------

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

@@ -50,9 +50,6 @@ struct comeback_timer_info {
 /*--------------------------------------------------------------------------
    Preprocessor definitions and constants
    ------------------------------------------------------------------------*/
-/* Maximum Number of WEP KEYS */
-#define MAX_WEP_KEYS 4
-
 #define SCH_PROTECTION_RESET_TIME 4000
 
 /*--------------------------------------------------------------------------
@@ -508,7 +505,7 @@ struct wlan_mlo_ie_info {
  * @vhtCapability:
  * @gLimOperatingMode:
  * @vhtCapabilityPresentInBeacon:
- * @ch_center_freq_seg0: center freq number as advertized OTA
+ * @ch_center_freq_seg0: center freq number as advertised OTA
  * @ch_width:
  * @puncture_bitmap:
  * @ch_center_freq_seg1:
@@ -773,8 +770,6 @@ struct pe_session {
 
 	uint8_t privacy;
 	tAniAuthType authType;
-	tSirKeyMaterial WEPKeyMaterial[MAX_WEP_KEYS];
-
 	tDot11fIEWMMParams wmm_params;
 	tDot11fIERSN gStartBssRSNIe;
 	tDot11fIEWPA gStartBssWPAIe;

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

@@ -101,9 +101,6 @@ static void __lim_init_bss_vars(struct mac_context *mac)
 {
 	qdf_mem_zero((void *)mac->lim.gpSession,
 		    sizeof(*mac->lim.gpSession) * mac->lim.maxBssId);
-
-	/* This is for testing purposes only, be default should always be off */
-	mac->lim.gpLimMlmSetKeysReq = NULL;
 }
 
 static void __lim_init_stats_vars(struct mac_context *mac)
@@ -467,13 +464,6 @@ void lim_cleanup(struct mac_context *mac)
 		mac->lim.pDialogueTokenTail = NULL;
 	}
 
-	if (mac->lim.gpLimMlmSetKeysReq) {
-		qdf_mem_zero(mac->lim.gpLimMlmSetKeysReq,
-			     sizeof(tLimMlmSetKeysReq));
-		qdf_mem_free(mac->lim.gpLimMlmSetKeysReq);
-		mac->lim.gpLimMlmSetKeysReq = NULL;
-	}
-
 	if (mac->lim.gpLimMlmAuthReq) {
 		qdf_mem_free(mac->lim.gpLimMlmAuthReq);
 		mac->lim.gpLimMlmAuthReq = NULL;

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

@@ -2529,7 +2529,6 @@ void lim_process_mlm_update_hidden_ssid_rsp(struct mac_context *mac_ctx,
 void lim_process_mlm_set_sta_key_rsp(struct mac_context *mac_ctx,
 	struct scheduler_msg *msg)
 {
-	uint8_t resp_reqd = 1;
 	struct sLimMlmSetKeysCnf mlm_set_key_cnf;
 	uint8_t session_id = 0;
 	uint8_t vdev_id;
@@ -2569,38 +2568,22 @@ void lim_process_mlm_set_sta_key_rsp(struct mac_context *mac_ctx,
 	}
 
 	MTRACE(mac_trace(mac_ctx, TRACE_CODE_MLM_STATE, session_id, mlm_state));
-	pe_debug("PE session ID %d, vdev_id %d", session_id, vdev_id);
 	result_status = set_key_params->status;
-	key_len = set_key_params->key[0].keyLength;
+	key_len = set_key_params->key_len;
+	pe_debug("PE session ID %d, vdev_id %d key_len %d status %d",
+		 session_id, vdev_id, key_len, result_status);
 
 	if (result_status == eSIR_SME_SUCCESS && key_len)
 		mlm_set_key_cnf.key_len_nonzero = true;
 	else
 		mlm_set_key_cnf.key_len_nonzero = false;
 
-	if (resp_reqd) {
-		tpLimMlmSetKeysReq lpLimMlmSetKeysReq =
-			(tpLimMlmSetKeysReq) mac_ctx->lim.gpLimMlmSetKeysReq;
-		/* Prepare and Send LIM_MLM_SETKEYS_CNF */
-		if (lpLimMlmSetKeysReq) {
-			qdf_copy_macaddr(&mlm_set_key_cnf.peer_macaddr,
-					 &lpLimMlmSetKeysReq->peer_macaddr);
-			/*
-			 * Free the buffer cached for the global
-			 * mac_ctx->lim.gpLimMlmSetKeysReq
-			 */
-			qdf_mem_zero(mac_ctx->lim.gpLimMlmSetKeysReq,
-				     sizeof(tpLimMlmSetKeysReq));
-			qdf_mem_free(mac_ctx->lim.gpLimMlmSetKeysReq);
-			mac_ctx->lim.gpLimMlmSetKeysReq = NULL;
-		} else {
-			qdf_copy_macaddr(&mlm_set_key_cnf.peer_macaddr,
-					 &set_key_params->macaddr);
-		}
-		mlm_set_key_cnf.sessionId = session_id;
-		lim_post_sme_message(mac_ctx, LIM_MLM_SETKEYS_CNF,
-			(uint32_t *) &mlm_set_key_cnf);
-	}
+	qdf_copy_macaddr(&mlm_set_key_cnf.peer_macaddr,
+			 &set_key_params->macaddr);
+	mlm_set_key_cnf.sessionId = session_id;
+	lim_post_sme_message(mac_ctx, LIM_MLM_SETKEYS_CNF,
+			     (uint32_t *) &mlm_set_key_cnf);
+
 	qdf_mem_zero(msg->bodyptr, sizeof(*set_key_params));
 	qdf_mem_free(msg->bodyptr);
 	msg->bodyptr = NULL;
@@ -2625,8 +2608,8 @@ void lim_process_mlm_set_bss_key_rsp(struct mac_context *mac_ctx,
 	uint8_t session_id = 0;
 	uint8_t vdev_id;
 	struct pe_session *session_entry;
-	tpLimMlmSetKeysReq set_key_req;
 	uint16_t key_len;
+	tSetBssKeyParams *bss_key;
 
 	SET_LIM_PROCESS_DEFD_MESGS(mac_ctx, true);
 	qdf_mem_zero((void *)&set_key_cnf, sizeof(tLimMlmSetKeysCnf));
@@ -2634,7 +2617,8 @@ void lim_process_mlm_set_bss_key_rsp(struct mac_context *mac_ctx,
 		pe_err("msg bodyptr is null");
 		return;
 	}
-	vdev_id = ((tpSetBssKeyParams) msg->bodyptr)->vdev_id;
+	bss_key = msg->bodyptr;
+	vdev_id = bss_key->vdev_id;
 	session_entry = pe_find_session_by_vdev_id(mac_ctx, vdev_id);
 	if (!session_entry) {
 		pe_err("session does not exist for vdev_id %d", vdev_id);
@@ -2648,16 +2632,8 @@ void lim_process_mlm_set_bss_key_rsp(struct mac_context *mac_ctx,
 	}
 
 	session_id = session_entry->peSessionId;
-	if (eLIM_MLM_WT_SET_BSS_KEY_STATE == session_entry->limMlmState) {
-		result_status =
-			(uint16_t)(((tpSetBssKeyParams)msg->bodyptr)->status);
-		key_len = ((tpSetBssKeyParams)msg->bodyptr)->key[0].keyLength;
-	} else {
-		result_status =
-			(uint16_t)(((tpSetBssKeyParams)msg->bodyptr)->status);
-		key_len = ((tpSetBssKeyParams)msg->bodyptr)->key[0].keyLength;
-	}
-
+	result_status = (uint16_t)bss_key->status;
+	key_len = bss_key->key_len;
 	pe_debug("vdev %d (pe %d) limMlmState %d status %d key_len %d",
 		 vdev_id, session_id, session_entry->limMlmState,
 		 result_status, key_len);
@@ -2670,26 +2646,10 @@ void lim_process_mlm_set_bss_key_rsp(struct mac_context *mac_ctx,
 	MTRACE(mac_trace
 		(mac_ctx, TRACE_CODE_MLM_STATE, session_entry->peSessionId,
 		session_entry->limMlmState));
-	set_key_req =
-		(tpLimMlmSetKeysReq) mac_ctx->lim.gpLimMlmSetKeysReq;
 	set_key_cnf.sessionId = session_id;
 
 	/* Prepare and Send LIM_MLM_SETKEYS_CNF */
-	if (set_key_req) {
-		qdf_copy_macaddr(&set_key_cnf.peer_macaddr,
-				 &set_key_req->peer_macaddr);
-		/*
-		 * Free the buffer cached for the
-		 * global mac_ctx->lim.gpLimMlmSetKeysReq
-		 */
-		qdf_mem_zero(mac_ctx->lim.gpLimMlmSetKeysReq,
-			     sizeof(*set_key_req));
-		qdf_mem_free(mac_ctx->lim.gpLimMlmSetKeysReq);
-		mac_ctx->lim.gpLimMlmSetKeysReq = NULL;
-	} else {
-		qdf_copy_macaddr(&set_key_cnf.peer_macaddr,
-				 &((tpSetBssKeyParams)msg->bodyptr)->macaddr);
-	}
+	qdf_copy_macaddr(&set_key_cnf.peer_macaddr, &bss_key->macaddr);
 	qdf_mem_zero(msg->bodyptr, sizeof(tSetBssKeyParams));
 	qdf_mem_free(msg->bodyptr);
 	msg->bodyptr = NULL;

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

@@ -760,25 +760,3 @@ lim_decrypt_auth_frame(struct mac_context *mac, uint8_t *pKey, uint8_t *pEncrBod
 
 	return QDF_STATUS_SUCCESS;
 } /****** end lim_decrypt_auth_frame() ******/
-
-/**
- * lim_post_sme_set_keys_cnf
- *
- * A utility API to send MLM_SETKEYS_CNF to SME
- */
-void lim_post_sme_set_keys_cnf(struct mac_context *mac,
-			       tLimMlmSetKeysReq *pMlmSetKeysReq,
-			       tLimMlmSetKeysCnf *mlmSetKeysCnf)
-{
-	/* Prepare and Send LIM_MLM_SETKEYS_CNF */
-	qdf_copy_macaddr(&mlmSetKeysCnf->peer_macaddr,
-			 &pMlmSetKeysReq->peer_macaddr);
-
-	/* Free up buffer allocated for mlmSetKeysReq */
-	qdf_mem_zero(pMlmSetKeysReq, sizeof(tLimMlmSetKeysReq));
-	qdf_mem_free(pMlmSetKeysReq);
-	mac->lim.gpLimMlmSetKeysReq = NULL;
-
-	lim_post_sme_message(mac,
-			     LIM_MLM_SETKEYS_CNF, (uint32_t *) mlmSetKeysCnf);
-}

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

@@ -90,9 +90,6 @@ void lim_encrypt_auth_frame(struct mac_context *, uint8_t, uint8_t *, uint8_t *,
 uint8_t lim_decrypt_auth_frame(struct mac_context *, uint8_t *, uint8_t *,
 			       uint8_t *, uint32_t, uint16_t);
 
-void lim_post_sme_set_keys_cnf(struct mac_context *, tLimMlmSetKeysReq *,
-			       tLimMlmSetKeysCnf *);
-
 #define  PTAPS  0xedb88320
 
 static inline uint32_t lim_crc_update(uint32_t crc, uint8_t x)

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

@@ -1015,9 +1015,6 @@ void pe_delete_session(struct mac_context *mac_ctx, struct pe_session *session)
 
 	session->mac_ctx = NULL;
 
-	qdf_mem_zero(session->WEPKeyMaterial,
-		     sizeof(session->WEPKeyMaterial));
-
 	if (session->access_policy_vendor_ie)
 		qdf_mem_free(session->access_policy_vendor_ie);
 

core/sme/inc/csr_internal.h

@@ -115,12 +115,6 @@ struct csr_channel {
 	uint32_t channel_freq_list[CFG_VALID_CHANNEL_LIST_LEN];
 };
 
-struct bss_config_param {
-	tSirMacSSid SSID;
-	enum csr_cfgdot11mode uCfgDot11Mode;
-	tSirMacCapabilityInfo BssCap;
-};
-
 struct roam_cmd {
 	enum csr_roam_reason roamReason;
 	tSirMacAddr peerMac;

core/wma/inc/wma_if.h

@@ -311,16 +311,14 @@ typedef struct {
 
 /**
  * struct tSetStaKeyParams - set key params
- * @staIdx: station id
  * @encType: encryption type
  * @defWEPIdx: Default WEP key, valid only for static WEP, must between 0 and 3
- * @key: valid only for non-static WEP encyrptions
  * @singleTidRc: 1=Single TID based Replay Count, 0=Per TID based RC
- * @smesessionId: sme session id
+ * @vdev_id: vdev_id
  * @peerMacAddr: peer mac address
  * @status: status
- * @sendRsp: send response
  * @macaddr: MAC address of the peer
+ * @key_len: key len
  *
  * This is used by PE to configure the key information on a given station.
  * When the secType is WEP40 or WEP104, the defWEPIdx is used to locate
@@ -330,35 +328,15 @@ typedef struct {
 typedef struct {
 	tAniEdType encType;
 	uint8_t defWEPIdx;
-	tSirKeys key[SIR_MAC_MAX_NUM_OF_DEFAULT_KEYS];
 	uint8_t singleTidRc;
 	uint8_t vdev_id;
 	struct qdf_mac_addr peer_macaddr;
 	QDF_STATUS status;
 	uint8_t sendRsp;
 	struct qdf_mac_addr macaddr;
+	uint16_t key_len;
 } tSetStaKeyParams, *tpSetStaKeyParams;
 
-/**
- * struct sLimMlmSetKeysReq - set key request parameters
- * @peerMacAddr: peer mac address
- * @sessionId: PE session id
- * @vdev_id: vdev id
- * @aid: association id
- * @edType: Encryption/Decryption type
- * @numKeys: number of keys
- * @key: key data
- */
-typedef struct sLimMlmSetKeysReq {
-	struct qdf_mac_addr peer_macaddr;
-	uint8_t sessionId;      /* Added For BT-AMP Support */
-	uint8_t vdev_id;   /* Added for drivers based on wmi interface */
-	uint16_t aid;
-	tAniEdType edType;      /* Encryption/Decryption type */
-	uint8_t numKeys;
-	tSirKeys key[SIR_MAC_MAX_NUM_OF_DEFAULT_KEYS];
-} tLimMlmSetKeysReq, *tpLimMlmSetKeysReq;
-
 /**
  * struct bss_params - parameters required for add bss params
  * @bssId: MAC Address/BSSID
@@ -530,22 +508,16 @@ typedef struct sSendProbeRespParams {
 
 /**
  * struct tSetBssKeyParams - BSS key parameters
- * @encType: encryption Type
- * @numKeys: number of keys
- * @key: key data
- * @singleTidRc: 1=Single TID based Replay Count, 0=Per TID based RC
  * @vdev_id: vdev id id
  * @status: return status of command
  * @macaddr: MAC address of the peer
+ * @key_len: key len
  */
 typedef struct {
-	tAniEdType encType;
-	uint8_t numKeys;
-	tSirKeys key[SIR_MAC_MAX_NUM_OF_DEFAULT_KEYS];
-	uint8_t singleTidRc;
 	uint8_t vdev_id;
 	QDF_STATUS status;
 	struct qdf_mac_addr macaddr;
+	uint16_t key_len;
 } tSetBssKeyParams, *tpSetBssKeyParams;
 
 /**

core/wma/src/wma_features.c

@@ -5638,7 +5638,7 @@ static void wma_send_set_key_rsp(uint8_t vdev_id, bool pairwise,
 			return;
 		key_info_uc->vdev_id = vdev_id;
 		key_info_uc->status = QDF_STATUS_SUCCESS;
-		key_info_uc->key[0].keyLength = crypto_key->keylen;
+		key_info_uc->key_len = crypto_key->keylen;
 		qdf_mem_copy(&key_info_uc->macaddr, &crypto_key->macaddr,
 			     QDF_MAC_ADDR_SIZE);
 		wma_send_msg_high_priority(wma, WMA_SET_STAKEY_RSP,
@@ -5650,7 +5650,7 @@ static void wma_send_set_key_rsp(uint8_t vdev_id, bool pairwise,
 			return;
 		key_info_mc->vdev_id = vdev_id;
 		key_info_mc->status = QDF_STATUS_SUCCESS;
-		key_info_mc->key[0].keyLength = crypto_key->keylen;
+		key_info_mc->key_len = crypto_key->keylen;
 		qdf_mem_copy(&key_info_mc->macaddr, &bcast_mac,
 			     QDF_MAC_ADDR_SIZE);
 		wma_send_msg_high_priority(wma, WMA_SET_BSSKEY_RSP,