From 2efd47f35d3ea15706207bda2d4879082dd15f95 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Wed, 18 Nov 2015 22:36:12 -0800 Subject: [PATCH] qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in sSirRateUpdateInd Replace tSirMacAddr with cdf_mac_addr in sSirRateUpdateInd. Change-Id: I28dc76e07721f6472bbc1ec5c107cd12b2123a8f CRs-Fixed: 898864 --- core/hdd/src/wlan_hdd_hostapd.c | 5 ++--- core/hdd/src/wlan_hdd_ioctl.c | 5 ++--- core/mac/inc/sir_api.h | 2 +- core/wma/src/wma_data.c | 7 ++++--- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 342051413f74..2afa2c746f89 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -2349,9 +2349,8 @@ static __iw_softap_setparam(struct net_device *dev, struct hdd_config *pConfig = hdd_ctx->config; hddLog(LOG1, "MC Target rate %d", set_value); - memcpy(rateUpdate.bssid, - pHostapdAdapter->macAddressCurrent.bytes, - sizeof(tSirMacAddr)); + cdf_copy_macaddr(&rateUpdate.bssid, + &pHostapdAdapter->macAddressCurrent); rateUpdate.nss = (pConfig->enable2x2 == 0) ? 0 : 1; rateUpdate.dev_mode = pHostapdAdapter->device_mode; rateUpdate.mcastDataRate24GHz = set_value; diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c index 39192ef4ddd4..d2218c541b8f 100644 --- a/core/hdd/src/wlan_hdd_ioctl.c +++ b/core/hdd/src/wlan_hdd_ioctl.c @@ -2444,11 +2444,10 @@ int wlan_hdd_set_mc_rate(hdd_adapter_t *pAdapter, int targetRate) rateUpdate.mcastDataRate24GHzTxFlag = 1; rateUpdate.mcastDataRate5GHz = targetRate; rateUpdate.bcastDataRate = -1; - memcpy(rateUpdate.bssid, pAdapter->macAddressCurrent.bytes, - sizeof(rateUpdate.bssid)); + cdf_copy_macaddr(&rateUpdate.bssid, &pAdapter->macAddressCurrent); hddLog(LOG1, FL("MC Target rate %d, mac = %pM, dev_mode %s(%d)"), - rateUpdate.mcastDataRate24GHz, rateUpdate.bssid, + rateUpdate.mcastDataRate24GHz, rateUpdate.bssid.bytes, hdd_device_mode_to_string(pAdapter->device_mode), pAdapter->device_mode); status = sme_send_rate_update_ind(pHddCtx->hHal, &rateUpdate); diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index dd57d2c4d4ff..486e7023e698 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -3717,7 +3717,7 @@ typedef struct { #endif typedef struct sSirRateUpdateInd { uint8_t nss; /* 0: 1x1, 1: 2x2 */ - tSirMacAddr bssid; + struct cdf_mac_addr bssid; tCDF_CON_MODE dev_mode; int32_t bcastDataRate; /* bcast rate unit Mbpsx10, -1:not used */ /* diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c index d334879cad0c..2c373c0308e9 100644 --- a/core/wma/src/wma_data.c +++ b/core/wma/src/wma_data.c @@ -1407,10 +1407,11 @@ CDF_STATUS wma_process_rate_update_indicate(tp_wma_handle wma, struct wma_txrx_node *intr = wma->interfaces; /* Get the vdev id */ - pdev = wma_find_vdev_by_addr(wma, pRateUpdateParams->bssid, &vdev_id); + pdev = wma_find_vdev_by_addr(wma, pRateUpdateParams->bssid.bytes, + &vdev_id); if (!pdev) { WMA_LOGE("vdev handle is invalid for %pM", - pRateUpdateParams->bssid); + pRateUpdateParams->bssid.bytes); cdf_mem_free(pRateUpdateParams); return CDF_STATUS_E_INVAL; } @@ -1440,7 +1441,7 @@ CDF_STATUS wma_process_rate_update_indicate(tp_wma_handle wma, WMA_LOGE("%s: dev_id = %d, dev_type = %d, dev_mode = %d, " "mac = %pM, config.shortgi = %d, rate_flags = 0x%x", __func__, vdev_id, intr[vdev_id].type, - pRateUpdateParams->dev_mode, pRateUpdateParams->bssid, + pRateUpdateParams->dev_mode, pRateUpdateParams->bssid.bytes, intr[vdev_id].config.shortgi, intr[vdev_id].rate_flags); ret = wma_encode_mc_rate(short_gi, intr[vdev_id].config.chwidth, intr[vdev_id].chanmode, intr[vdev_id].mhz,