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
This commit is contained in:
Srinivas Girigowda 2015-11-18 22:36:12 -08:00 • committed by Satish Singh
commit 2efd47f35d
4 changed files with 9 additions and 10 deletions

View file

@ -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;

View file

@ -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);

View file

@ -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 */
/*

View file

@ -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,