Selaa lähdekoodia

qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in sSirDelPeriodicTxPtrn

Replace tSirMacAddr with cdf_mac_addr in sSirDelPeriodicTxPtrn.

Change-Id: I0445b5c7ec7d1e361b5ab7d72d2c607c6b8121c0
CRs-Fixed: 898864
Srinivas Girigowda 9 vuotta sitten
vanhempi
sitoutus
a5bba7ad2b

+ 2 - 3
core/hdd/src/wlan_hdd_cfg80211.c

@@ -3679,9 +3679,8 @@ wlan_hdd_del_tx_ptrn(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx,
 		return -ENOMEM;
 	}
 
-	cdf_mem_copy(del_req->macAddress, adapter->macAddressCurrent.bytes,
-			CDF_MAC_ADDR_SIZE);
-	hddLog(LOG1, MAC_ADDRESS_STR, MAC_ADDR_ARRAY(del_req->macAddress));
+	cdf_copy_macaddr(&del_req->mac_address, &adapter->macAddressCurrent);
+	hdd_info(MAC_ADDRESS_STR, MAC_ADDR_ARRAY(del_req->mac_address.bytes));
 	del_req->ucPtrnId = pattern_id;
 	hddLog(LOG1, FL("Request Id: %u Pattern id: %d"),
 			 request_id, del_req->ucPtrnId);

+ 2 - 2
core/hdd/src/wlan_hdd_debugfs.c

@@ -405,8 +405,8 @@ static ssize_t __wcnss_patterngen_write(struct file *file,
 		}
 		delPeriodicTxPtrnParams->ucPtrnId = pattern_idx;
 		delPeriodicTxPtrnParams->ucPatternIdBitmap = 1 << pattern_idx;
-		cdf_mem_copy(delPeriodicTxPtrnParams->macAddress,
-			     pAdapter->macAddressCurrent.bytes, 6);
+		cdf_copy_macaddr(&delPeriodicTxPtrnParams->mac_address,
+				 &pAdapter->macAddressCurrent);
 
 		/* Delete pattern */
 		status = sme_del_periodic_tx_ptrn(pHddCtx->hHal,

+ 1 - 1
core/mac/inc/sir_api.h

@@ -3685,7 +3685,7 @@ typedef struct sSirAddPeriodicTxPtrn {
 
 typedef struct sSirDelPeriodicTxPtrn {
 	/* MAC Address for the adapter */
-	tSirMacAddr macAddress;
+	struct cdf_mac_addr mac_address;
 	/* Bitmap of pattern IDs that need to be deleted */
 	uint32_t ucPatternIdBitmap;
 	uint8_t ucPtrnId;       /* Pattern ID */

+ 2 - 2
core/wma/src/wma_features.c

@@ -5213,10 +5213,10 @@ CDF_STATUS wma_process_del_periodic_tx_ptrn_ind(WMA_HANDLE handle,
 		return CDF_STATUS_E_NOMEM;
 	}
 	if (!wma_find_vdev_by_addr(wma_handle,
-				   pDelPeriodicTxPtrnParams->macAddress,
+				   pDelPeriodicTxPtrnParams->mac_address.bytes,
 				   &vdev_id)) {
 		WMA_LOGE("%s: Failed to find vdev id for %pM", __func__,
-			 pDelPeriodicTxPtrnParams->macAddress);
+			 pDelPeriodicTxPtrnParams->mac_address.bytes);
 		cdf_nbuf_free(wmi_buf);
 		return CDF_STATUS_E_INVAL;
 	}