A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-24 05:29:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in tSirAppTypeParams

Browse source 
Replace tSirMacAddr with cdf_mac_addr in tSirAppTypeParams

Change-Id: I4629ab11d8014eae6ba27b24362b9253be1606b7
CRs-Fixed: 898864
This commit is contained in:
Srinivas Girigowda 2015-11-24 12:11:13 -08:00 • committed by Satish Singh
commit b0a524b4ea
3 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
core/hdd/src/wlan_hdd_ioctl.c
View file

@ -1723,7 +1723,7 @@ static int hdd_set_app_type1_parser(hdd_adapter_t *adapter,
tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(adapter);
char id[20], password[20];
tSirAppType1Params params;
int rc, i;
int rc;
rc = wlan_hdd_validate_context(hdd_ctx);
if (0 != rc) {
@ -1739,9 +1739,7 @@ static int hdd_set_app_type1_parser(hdd_adapter_t *adapter,
memset(&params, 0, sizeof(tSirAppType1Params));
params.vdev_id = adapter->sessionId;
for (i = 0; i < ETHER_ADDR_LEN; i++)
params.wakee_mac_addr[i] =
adapter->macAddressCurrent.bytes[i];
cdf_copy_macaddr(&params.wakee_mac_addr, &adapter->macAddressCurrent);
params.id_length = strlen(id);
cdf_mem_copy(params.identification_id, id, params.id_length);
@ -1750,7 +1748,7 @@ static int hdd_set_app_type1_parser(hdd_adapter_t *adapter,
CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: %d %pM %.8s %u %.16s %u",
__func__, params.vdev_id, params.wakee_mac_addr,
__func__, params.vdev_id, params.wakee_mac_addr.bytes,
params.identification_id, params.id_length,
params.password, params.pass_length);
@ -1782,7 +1780,7 @@ static int hdd_set_app_type2_parser(hdd_adapter_t *adapter,
hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(adapter);
char mac_addr[20], rc4_key[20];
unsigned int gateway_mac[6], i;
unsigned int gateway_mac[CDF_MAC_ADDR_SIZE];
tSirAppType2Params params;
int ret;
@ -1831,8 +1829,8 @@ static int hdd_set_app_type2_parser(hdd_adapter_t *adapter,
return -EINVAL;
}
for (i = 0; i < ETHER_ADDR_LEN; i++)
params.gateway_mac[i] = (uint8_t) gateway_mac[i];
cdf_mem_copy(&params.gateway_mac.bytes, (uint8_t *) &gateway_mac,
CDF_MAC_ADDR_SIZE);
params.rc4_key_len = strlen(rc4_key);
cdf_mem_copy(params.rc4_key, rc4_key, params.rc4_key_len);

4
core/mac/inc/sir_api.h
View file

@ -2650,7 +2650,7 @@ typedef struct {
typedef struct {
uint8_t vdev_id;
tSirMacAddr wakee_mac_addr;
struct cdf_mac_addr wakee_mac_addr;
uint8_t identification_id[8];
uint8_t password[16];
uint32_t id_length;
@ -2679,7 +2679,7 @@ typedef struct {
uint32_t keepalive_max; /* Maximum ping interval */
uint32_t keepalive_inc; /* Increment of ping interval */
tSirMacAddr gateway_mac;
struct cdf_mac_addr gateway_mac;
uint32_t tcp_tx_timeout_val;
uint32_t tcp_rx_timeout_val;
} tSirAppType2Params, *tpSirAppType2Params;

8
core/wma/src/wma_features.c
View file

@ -5413,7 +5413,7 @@ int wma_set_app_type1_params_in_fw(tp_wma_handle wma,
(wmi_extwow_set_app_type1_params_cmd_fixed_param));
cmd->vdev_id = appType1Params->vdev_id;
WMI_CHAR_ARRAY_TO_MAC_ADDR(appType1Params->wakee_mac_addr,
WMI_CHAR_ARRAY_TO_MAC_ADDR(appType1Params->wakee_mac_addr.bytes,
&cmd->wakee_mac);
cdf_mem_copy(cmd->ident, appType1Params->identification_id, 8);
cmd->ident_len = appType1Params->id_length;
@ -5423,7 +5423,7 @@ int wma_set_app_type1_params_in_fw(tp_wma_handle wma,
WMA_LOGD("%s: vdev_id %d wakee_mac_addr %pM "
"identification_id %.8s id_length %u "
"password %.16s pass_length %u",
__func__, cmd->vdev_id, appType1Params->wakee_mac_addr,
__func__, cmd->vdev_id, appType1Params->wakee_mac_addr.bytes,
cmd->ident, cmd->ident_len, cmd->passwd, cmd->passwd_len);
ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len,
@ -5486,7 +5486,7 @@ int wma_set_app_type2_params_in_fw(tp_wma_handle wma,
cmd->keepalive_max = appType2Params->keepalive_max;
cmd->keepalive_inc = appType2Params->keepalive_inc;
WMI_CHAR_ARRAY_TO_MAC_ADDR(appType2Params->gateway_mac,
WMI_CHAR_ARRAY_TO_MAC_ADDR(appType2Params->gateway_mac.bytes,
&cmd->gateway_mac);
cmd->tcp_tx_timeout_val = appType2Params->tcp_tx_timeout_val;
cmd->tcp_rx_timeout_val = appType2Params->tcp_rx_timeout_val;
@ -5498,7 +5498,7 @@ int wma_set_app_type2_params_in_fw(tp_wma_handle wma,
"tcp_ack_seq %u keepalive_init %u keepalive_min %u "
"keepalive_max %u keepalive_inc %u "
"tcp_tx_timeout_val %u tcp_rx_timeout_val %u",
__func__, cmd->vdev_id, appType2Params->gateway_mac,
__func__, cmd->vdev_id, appType2Params->gateway_mac.bytes,
cmd->rc4_key, cmd->rc4_key_len,
cmd->ip_id, cmd->ip_device_ip, cmd->ip_server_ip,
cmd->tcp_src_port, cmd->tcp_dst_port, cmd->tcp_seq,