From a5bba7ad2beefdeb7499384c3c5d53d091bc5e67 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Wed, 18 Nov 2015 22:44:36 -0800 Subject: [PATCH] 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 --- core/hdd/src/wlan_hdd_cfg80211.c | 5 ++--- core/hdd/src/wlan_hdd_debugfs.c | 4 ++-- core/mac/inc/sir_api.h | 2 +- core/wma/src/wma_features.c | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 7cdcb10337d6..3ab1dbe003e6 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/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); diff --git a/core/hdd/src/wlan_hdd_debugfs.c b/core/hdd/src/wlan_hdd_debugfs.c index f4732d546dd2..54259162475f 100644 --- a/core/hdd/src/wlan_hdd_debugfs.c +++ b/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, diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index b3f5418c5f3e..41c3de92b291 100644 --- a/core/mac/inc/sir_api.h +++ b/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 */ diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index 30fa789fbc36..74ede3e6d92d 100644 --- a/core/wma/src/wma_features.c +++ b/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; }