From 9dc32cfb0f97dcb26612c9cc1d861fd61356ef07 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Thu, 19 Nov 2015 14:47:04 -0800 Subject: [PATCH] qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in sSirLPHBTcpParamStruct Replace tSirMacAddr with cdf_mac_addr in sSirLPHBTcpParamStruct Change-Id: I55cbe3c441c2b1540e946e52c815bc5518935964 CRs-Fixed: 898864 --- core/mac/inc/sir_api.h | 2 +- core/wma/src/wma_features.c | 17 +++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index c4a979b4bdf7..99a08ba194b8 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -3625,7 +3625,7 @@ typedef struct sSirLPHBTcpParamStruct { uint16_t dst_port; uint16_t timeout; uint8_t session; - tSirMacAddr gateway_mac; + struct cdf_mac_addr gateway_mac; uint16_t timePeriodSec; /* in seconds */ uint32_t tcpSn; } tSirLPHBTcpParamStruct; diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index 09353523be5c..cff570c39ce4 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -438,17 +438,14 @@ CDF_STATUS wma_lphb_conf_tcp_params(tp_wma_handle wma_handle, } ts_lphb_tcp_param = &(lphb_conf_req->params.lphbTcpParamReq); - WMA_LOGI("%s: WMA --> WMI_HB_SET_TCP_PARAMS srv_ip=%08x, dev_ip=%08x, src_port=%d, " - "dst_port=%d, timeout=%d, session=%d, gateway_mac=%02x:%02x:%02x:%02x:%02x:%02x, " - "timePeriodSec=%d, tcpSn=%d", __func__, ts_lphb_tcp_param->srv_ip, + WMA_LOGI("%s: WMA --> WMI_HB_SET_TCP_PARAMS srv_ip=%08x, " + "dev_ip=%08x, src_port=%d, dst_port=%d, timeout=%d, " + "session=%d, gateway_mac="MAC_ADDRESS_STR", timePeriodSec=%d, " + "tcpSn=%d", __func__, ts_lphb_tcp_param->srv_ip, ts_lphb_tcp_param->dev_ip, ts_lphb_tcp_param->src_port, ts_lphb_tcp_param->dst_port, ts_lphb_tcp_param->timeout, - ts_lphb_tcp_param->session, ts_lphb_tcp_param->gateway_mac[0], - ts_lphb_tcp_param->gateway_mac[1], - ts_lphb_tcp_param->gateway_mac[2], - ts_lphb_tcp_param->gateway_mac[3], - ts_lphb_tcp_param->gateway_mac[4], - ts_lphb_tcp_param->gateway_mac[5], + ts_lphb_tcp_param->session, + MAC_ADDR_ARRAY(ts_lphb_tcp_param->gateway_mac.bytes), ts_lphb_tcp_param->timePeriodSec, ts_lphb_tcp_param->tcpSn); buf = wmi_buf_alloc(wma_handle->wmi_handle, len); @@ -474,7 +471,7 @@ CDF_STATUS wma_lphb_conf_tcp_params(tp_wma_handle wma_handle, hb_tcp_params_fp->interval = ts_lphb_tcp_param->timePeriodSec; hb_tcp_params_fp->timeout = ts_lphb_tcp_param->timeout; hb_tcp_params_fp->session = ts_lphb_tcp_param->session; - WMI_CHAR_ARRAY_TO_MAC_ADDR(ts_lphb_tcp_param->gateway_mac, + WMI_CHAR_ARRAY_TO_MAC_ADDR(ts_lphb_tcp_param->gateway_mac.bytes, &hb_tcp_params_fp->gateway_mac); status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf,