Browse Source

qcacld-3.0: Remove unused variable pe_session->is_key_installed

Remove unused variable pe_session->is_key_installed.

Change-Id: I532af9b36faa7998061a9fcbbc058f2cd1ef8e9a
CRs-Fixed: 3230695
Abhishek Singh 2 years ago
parent
commit
95bf3bb120

+ 0 - 1
core/mac/src/pe/include/lim_session.h

@@ -703,7 +703,6 @@ struct pe_session {
 	bool isNonRoamReassoc;
 	qdf_mc_timer_t pmf_retry_timer;
 	struct comeback_timer_info pmf_retry_timer_info;
-	uint8_t  is_key_installed;
 	/* timer for resetting protection fileds at regular intervals */
 	qdf_mc_timer_t protection_fields_reset_timer;
 	/* timer to decrement CSA/ECSA count */

+ 1 - 4
core/mac/src/pe/lim/lim_api.c

@@ -2783,11 +2783,8 @@ pe_roam_synch_callback(struct mac_context *mac_ctx,
 		return status;
 	}
 
-	if (roam_sync_ind_ptr->auth_status ==
-	    ROAM_AUTH_STATUS_AUTHENTICATED) {
-		ft_session_ptr->is_key_installed = true;
+	if (roam_sync_ind_ptr->auth_status == ROAM_AUTH_STATUS_AUTHENTICATED)
 		curr_sta_ds->is_key_installed = true;
-	}
 
 	reassoc_resp = (uint8_t *)roam_sync_ind_ptr +
 			roam_sync_ind_ptr->reassocRespOffset;

+ 7 - 7
core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c

@@ -1227,7 +1227,7 @@ void lim_process_mlm_set_keys_cnf(struct mac_context *mac, uint32_t *msg_buf)
 	tLimMlmSetKeysCnf *pMlmSetKeysCnf;
 	struct pe_session *pe_session;
 	uint16_t aid;
-	tpDphHashNode sta_ds;
+	tpDphHashNode sta_ds = NULL;
 
 	if (!msg_buf) {
 		pe_err("Buffer is Pointing to NULL");
@@ -1241,22 +1241,22 @@ void lim_process_mlm_set_keys_cnf(struct mac_context *mac, uint32_t *msg_buf)
 		       pMlmSetKeysCnf->sessionId);
 		return;
 	}
-	pe_session->is_key_installed = 0;
 	/* if the status is success keys are installed in the
 	* Firmware so we can set the protection bit
 	*/
 	if (eSIR_SME_SUCCESS == pMlmSetKeysCnf->resultCode) {
-		if (pMlmSetKeysCnf->key_len_nonzero)
-			pe_session->is_key_installed = 1;
 		sta_ds = dph_lookup_hash_entry(mac,
 				pMlmSetKeysCnf->peer_macaddr.bytes,
 				&aid, &pe_session->dph.dphHashTable);
 		if (sta_ds && pMlmSetKeysCnf->key_len_nonzero)
 			sta_ds->is_key_installed = 1;
 	}
-	pe_debug("vdev %d Status %d is_key_installed %d",
-		 pe_session->vdev_id, pMlmSetKeysCnf->resultCode,
-		 pe_session->is_key_installed);
+	pe_debug("vdev %d: " QDF_MAC_ADDR_FMT " Status %d key_len_nonzero %d key installed %d",
+		 pe_session->vdev_id,
+		 QDF_MAC_ADDR_REF(pMlmSetKeysCnf->peer_macaddr.bytes),
+		 pMlmSetKeysCnf->resultCode,
+		 pMlmSetKeysCnf->key_len_nonzero,
+		 sta_ds ? sta_ds->is_key_installed : 0);
 
 	lim_send_sme_set_context_rsp(mac,
 				     pMlmSetKeysCnf->peer_macaddr,