samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in sAniDHCPStopInd

Browse Source 
Replace tSirMacAddr with cdf_mac_addr in sAniDHCPStopInd.

Change-Id: I56dfa86947e9711c8727d4e3d025f0f03fc39d3c
CRs-Fixed: 898864
This commit is contained in:
Srinivas Girigowda
2015-09-24 16:31:16 -07:00
committed by Satish Singh
parent de9d9d3985
commit 43f63cdbb5
3 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/mac/inc/sir_api.h
View File

@@ -1800,13 +1800,20 @@ typedef struct sAniGenericChangeCountryCodeReq {
uint16_t domain_index; uint16_t domain_index;
} tAniGenericChangeCountryCodeReq, *tpAniGenericChangeCountryCodeReq; } tAniGenericChangeCountryCodeReq, *tpAniGenericChangeCountryCodeReq;
/**
* struct sAniDHCPStopInd - DHCP Stop indication message
* @msgType: message type is same as the request type
* @msgLen: length of the entire request
* @device_mode: Mode of the device(ex:STA, AP)
* @adapterMacAddr: MAC address of the adapter
* @peerMacAddr: MAC address of the connected peer
*/
typedef struct sAniDHCPStopInd { typedef struct sAniDHCPStopInd {
uint16_t msgType; /* message type is same as the request type */ uint16_t msgType;
uint16_t msgLen; /* length of the entire request */ uint16_t msgLen;
uint8_t device_mode; /* Mode of the device(ex:STA, AP) */ uint8_t device_mode;
tSirMacAddr adapterMacAddr; /* MAC address of the adapter */ struct cdf_mac_addr adapterMacAddr;
tSirMacAddr peerMacAddr; /* MAC address of the connected peer */ struct cdf_mac_addr peerMacAddr;
} tAniDHCPInd, *tpAniDHCPInd; } tAniDHCPInd, *tpAniDHCPInd;
typedef enum eTxRateInfo { typedef enum eTxRateInfo {

18
core/sme/src/common/sme_api.c
View File

@@ -5239,11 +5239,10 @@ CDF_STATUS sme_dhcp_start_ind(tHalHandle hHal,
pMsg->msgType = WMA_DHCP_START_IND; pMsg->msgType = WMA_DHCP_START_IND;
pMsg->msgLen = (uint16_t) sizeof(tAniDHCPInd); pMsg->msgLen = (uint16_t) sizeof(tAniDHCPInd);
pMsg->device_mode = device_mode; pMsg->device_mode = device_mode;
cdf_mem_copy(pMsg->adapterMacAddr, macAddr, cdf_mem_copy(pMsg->adapterMacAddr.bytes, macAddr,
sizeof(tSirMacAddr)); CDF_MAC_ADDR_SIZE);
cdf_mem_copy(pMsg->peerMacAddr, cdf_copy_macaddr(&pMsg->peerMacAddr,
pSession->connectedProfile.bssid.bytes, &pSession->connectedProfile.bssid);
sizeof(tSirMacAddr));
cds_message.type = WMA_DHCP_START_IND; cds_message.type = WMA_DHCP_START_IND;
cds_message.bodyptr = pMsg; cds_message.bodyptr = pMsg;
@@ -5311,11 +5310,10 @@ CDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal,
pMsg->msgType = WMA_DHCP_STOP_IND; pMsg->msgType = WMA_DHCP_STOP_IND;
pMsg->msgLen = (uint16_t) sizeof(tAniDHCPInd); pMsg->msgLen = (uint16_t) sizeof(tAniDHCPInd);
pMsg->device_mode = device_mode; pMsg->device_mode = device_mode;
cdf_mem_copy(pMsg->adapterMacAddr, macAddr, cdf_mem_copy(pMsg->adapterMacAddr.bytes, macAddr,
sizeof(tSirMacAddr)); CDF_MAC_ADDR_SIZE);
cdf_mem_copy(pMsg->peerMacAddr, cdf_copy_macaddr(&pMsg->peerMacAddr,
pSession->connectedProfile.bssid.bytes, &pSession->connectedProfile.bssid);
sizeof(tSirMacAddr));
cds_message.type = WMA_DHCP_STOP_IND; cds_message.type = WMA_DHCP_STOP_IND;
cds_message.bodyptr = pMsg; cds_message.bodyptr = pMsg;

7
core/wma/src/wma_features.c
View File

@@ -782,7 +782,8 @@ CDF_STATUS wma_process_dhcp_ind(tp_wma_handle wma_handle,
return CDF_STATUS_E_FAILURE; return CDF_STATUS_E_FAILURE;
} }
if (!wma_find_vdev_by_addr(wma_handle, ta_dhcp_ind->adapterMacAddr, if (!wma_find_vdev_by_addr(wma_handle,
ta_dhcp_ind->adapterMacAddr.bytes,
&vdev_id)) { &vdev_id)) {
WMA_LOGE("%s: Failed to find vdev id for DHCP indication", WMA_LOGE("%s: Failed to find vdev id for DHCP indication",
__func__); __func__);
@@ -796,7 +797,7 @@ CDF_STATUS wma_process_dhcp_ind(tp_wma_handle wma_handle,
ta_dhcp_ind->msgType == WMA_DHCP_START_IND ? ta_dhcp_ind->msgType == WMA_DHCP_START_IND ?
"WMA_DHCP_START_IND" : "WMA_DHCP_STOP_IND", "WMA_DHCP_START_IND" : "WMA_DHCP_STOP_IND",
ta_dhcp_ind->device_mode, ta_dhcp_ind->device_mode,
MAC_ADDR_ARRAY(ta_dhcp_ind->peerMacAddr)); MAC_ADDR_ARRAY(ta_dhcp_ind->peerMacAddr.bytes));
buf = wmi_buf_alloc(wma_handle->wmi_handle, len); buf = wmi_buf_alloc(wma_handle->wmi_handle, len);
if (!buf) { if (!buf) {
@@ -818,7 +819,7 @@ CDF_STATUS wma_process_dhcp_ind(tp_wma_handle wma_handle,
peer_set_param_fp->param_value = 1; peer_set_param_fp->param_value = 1;
else else
peer_set_param_fp->param_value = 0; peer_set_param_fp->param_value = 0;
WMI_CHAR_ARRAY_TO_MAC_ADDR(ta_dhcp_ind->peerMacAddr, WMI_CHAR_ARRAY_TO_MAC_ADDR(ta_dhcp_ind->peerMacAddr.bytes,
&peer_set_param_fp->peer_macaddr); &peer_set_param_fp->peer_macaddr);
status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf,