Sfoglia il codice sorgente

qcacmn: cleanup key_rsc_counter pointer from set key param

Remove unused param key_rsc_counter of set_key_param
structure, as key_rsc_ctr is used to send key rx sc
counter to fw and rename key_rsc_ctr to key_rsc_counter
as win is using key_rsc_counter.

Change-Id: Id58aabb30d772f8f620ac9f96890fcac0193777b
CRs-Fixed: 3256574
Sheenam Monga 2 anni fa
parent
commit
46644d2926

+ 3 - 3
target_if/crypto/src/target_if_crypto.c

@@ -208,7 +208,7 @@ QDF_STATUS target_if_crypto_set_key(struct wlan_objmgr_vdev *vdev,
 		pairwise = true;
 		params.key_flags |= PAIRWISE_USAGE;
 	}
-	qdf_mem_copy(&params.key_rsc_ctr,
+	qdf_mem_copy(&params.key_rsc_counter,
 		     &req->keyrsc[0], sizeof(uint64_t));
 
 	target_if_debug("key_type %d, mac: %02x:%02x:%02x:%02x:%02x:%02x",
@@ -265,7 +265,7 @@ QDF_STATUS target_if_crypto_set_key(struct wlan_objmgr_vdev *vdev,
 	params.key_len = req->keylen;
 
 	/* Set PN check & security type in data path */
-	qdf_mem_copy(&pn[0], &params.key_rsc_ctr, sizeof(uint64_t));
+	qdf_mem_copy(&pn[0], &params.key_rsc_counter, sizeof(uint64_t));
 
 	if (peer_type == WLAN_PEER_RTT_PASN)
 		goto send_install_key;
@@ -285,7 +285,7 @@ send_install_key:
 	target_if_debug("peer mac "QDF_MAC_ADDR_FMT,
 			QDF_MAC_ADDR_REF(params.peer_mac));
 	QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_CRYPTO, QDF_TRACE_LEVEL_DEBUG,
-			   &params.key_rsc_ctr, sizeof(uint64_t));
+			   &params.key_rsc_counter, sizeof(uint64_t));
 	status = wmi_unified_setup_install_key_cmd(pdev_wmi_handle, &params);
 
 	/* Zero-out local key variables */

+ 1 - 4
wmi/inc/wmi_unified_param.h

@@ -1790,8 +1790,6 @@ struct wmi_probe_resp_params {
  * @key_rxmic_len: rx mic length
  * @key_tsc_counter:  key tx sc counter
  * @key_rsc_counter:  key rx sc counter
- * @key_rsc_ctr:  key rx sc counter (stack variable, unnecessary heap alloc for
- *                key_rsc_counter should be cleaned up eventually)
  * @rx_iv: receive IV, applicable only in case of WAPI
  * @tx_iv: transmit IV, applicable only in case of WAPI
  * @key_data: key data
@@ -1807,8 +1805,7 @@ struct set_key_params {
 	uint32_t key_txmic_len;
 	uint32_t key_rxmic_len;
 	uint64_t key_tsc_counter;
-	uint64_t *key_rsc_counter;
-	uint64_t key_rsc_ctr;
+	uint64_t key_rsc_counter;
 #if defined(ATH_SUPPORT_WAPI) || defined(FEATURE_WLAN_WAPI)
 	uint8_t rx_iv[16];
 	uint8_t tx_iv[16];

+ 1 - 1
wmi/src/wmi_unified_tlv.c

@@ -5401,7 +5401,7 @@ static QDF_STATUS send_setup_install_key_cmd_tlv(wmi_unified_t wmi_handle,
 	WMI_HOST_IF_MSG_COPY_CHAR_ARRAY((void *)key_data,
 					(const void *)key_params->key_data,
 					key_params->key_len);
-	qdf_mem_copy(&cmd->key_rsc_counter, &key_params->key_rsc_ctr,
+	qdf_mem_copy(&cmd->key_rsc_counter, &key_params->key_rsc_counter,
 		     sizeof(wmi_key_seq_counter));
 	cmd->key_len = key_params->key_len;