From f49f17ea85983dd9a57ef9af1702a2f654948979 Mon Sep 17 00:00:00 2001 From: gaurank kathpalia Date: Mon, 28 Jan 2019 19:48:16 +0530 Subject: [PATCH] qcacmn: Use the peer mac address array instead of structure Currently the driver uses structure for peer mac address to store the mac address. Use the already existing peer mac address array for the same. Change-Id: Ib49b2ac4747fce3610da73a1d29c67ccaaeaad65 CRs-Fixed: 2390282 --- wmi/inc/wmi_unified_param.h | 4 +--- wmi/src/wmi_unified_tlv.c | 10 ---------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/wmi/inc/wmi_unified_param.h b/wmi/inc/wmi_unified_param.h index 6da544556e..5e48db4f39 100644 --- a/wmi/inc/wmi_unified_param.h +++ b/wmi/inc/wmi_unified_param.h @@ -1187,7 +1187,6 @@ typedef struct { /** * struct peer_assoc_params - peer assoc cmd parameter - * @peer_macaddr: peer mac address * @vdev_id: vdev id * @peer_new_assoc: peer association type * @peer_associd: peer association id @@ -1243,7 +1242,6 @@ typedef struct { * @peer_ppet: Peer HE PPET info */ struct peer_assoc_params { - wmi_host_mac_addr peer_macaddr; uint32_t vdev_id; uint32_t peer_new_assoc; uint32_t peer_associd; @@ -1289,8 +1287,8 @@ struct peer_assoc_params { bool safe_mode_enabled; bool amsdu_disable; /* Use common structure */ - uint8_t peer_mac[IEEE80211_ADDR_LEN]; #endif + uint8_t peer_mac[IEEE80211_ADDR_LEN]; bool he_flag; bool twt_requester; bool twt_responder; diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c index 42f3fdacc4..59ffe1ff8b 100644 --- a/wmi/src/wmi_unified_tlv.c +++ b/wmi/src/wmi_unified_tlv.c @@ -2118,22 +2118,12 @@ static inline void copy_peer_flags_tlv( } #endif -#ifdef CONFIG_MCL -static inline void copy_peer_mac_addr_tlv( - wmi_peer_assoc_complete_cmd_fixed_param * cmd, - struct peer_assoc_params *param) -{ - qdf_mem_copy(&cmd->peer_macaddr, ¶m->peer_macaddr, - sizeof(param->peer_macaddr)); -} -#else static inline void copy_peer_mac_addr_tlv( wmi_peer_assoc_complete_cmd_fixed_param * cmd, struct peer_assoc_params *param) { WMI_CHAR_ARRAY_TO_MAC_ADDR(param->peer_mac, &cmd->peer_macaddr); } -#endif /** * send_peer_assoc_cmd_tlv() - WMI peer assoc function