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

qcacmn: Clean up of CONFIG_MCL and memory optimisation

Browse Source 
Clean up of CONFIG_MCL and optimise memory of peer_assoc_param
structure by use of bit fields instead of bool type

Change-Id: I4b06af69b7fd9af981a250c881d163ddb1f68fa7
CRs-Fixed: 2450763
This commit is contained in:
Surya Prakash Raajen
2019-05-10 17:30:39 +05:30
committed by nshrivas
parent f0fa2f5beb
commit b5ff47a32a
2 changed files with 23 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
wmi/inc/wmi_unified_param.h
View File

@@ -1223,7 +1223,6 @@ typedef struct {
* @vdev_id: vdev id * @vdev_id: vdev id
* @peer_new_assoc: peer association type * @peer_new_assoc: peer association type
* @peer_associd: peer association id * @peer_associd: peer association id
* @peer_flags: peer flags
* @peer_caps: peer capabalities * @peer_caps: peer capabalities
* @peer_listen_intval: peer listen interval * @peer_listen_intval: peer listen interval
* @peer_ht_caps: HT capabalities * @peer_ht_caps: HT capabalities
@@ -1279,7 +1278,6 @@ struct peer_assoc_params {
uint32_t vdev_id; uint32_t vdev_id;
uint32_t peer_new_assoc; uint32_t peer_new_assoc;
uint32_t peer_associd; uint32_t peer_associd;
uint32_t peer_flags;
uint32_t peer_caps; uint32_t peer_caps;
uint32_t peer_listen_intval; uint32_t peer_listen_intval;
uint32_t peer_ht_caps; uint32_t peer_ht_caps;
@@ -1298,30 +1296,29 @@ struct peer_assoc_params {
uint32_t tx_mcs_set; uint32_t tx_mcs_set;
uint8_t vht_capable; uint8_t vht_capable;
uint32_t peer_bw_rxnss_override; uint32_t peer_bw_rxnss_override;
#ifndef CONFIG_MCL
uint32_t tx_max_mcs_nss; uint32_t tx_max_mcs_nss;
bool is_pmf_enabled; uint32_t is_pmf_enabled:1,
bool is_wme_set; is_wme_set:1,
bool qos_flag; qos_flag:1,
bool apsd_flag; apsd_flag:1,
bool ht_flag; ht_flag:1,
bool bw_40; bw_40:1,
bool bw_80; bw_80:1,
bool bw_160; bw_160:1,
bool stbc_flag; stbc_flag:1,
bool ldpc_flag; ldpc_flag:1,
bool static_mimops_flag; static_mimops_flag:1,
bool dynamic_mimops_flag; dynamic_mimops_flag:1,
bool spatial_mux_flag; spatial_mux_flag:1,
bool vht_flag; vht_flag:1,
bool vht_ng_flag; vht_ng_flag:1,
bool need_ptk_4_way; need_ptk_4_way:1,
bool need_gtk_2_way; need_gtk_2_way:1,
bool auth_flag; auth_flag:1,
bool safe_mode_enabled; safe_mode_enabled:1,
bool amsdu_disable; amsdu_disable:1,
p2p_capable_sta:1;
/* Use common structure */ /* Use common structure */
#endif
uint8_t peer_mac[QDF_MAC_ADDR_SIZE]; uint8_t peer_mac[QDF_MAC_ADDR_SIZE];
bool he_flag; bool he_flag;
bool twt_requester; bool twt_requester;

11
wmi/src/wmi_unified_tlv.c
View File

@@ -2325,14 +2325,6 @@ static QDF_STATUS send_beacon_tmpl_send_cmd_tlv(wmi_unified_t wmi_handle,
return 0; return 0;
} }
#ifdef CONFIG_MCL
static inline void copy_peer_flags_tlv(
wmi_peer_assoc_complete_cmd_fixed_param * cmd,
struct peer_assoc_params *param)
{
cmd->peer_flags = param->peer_flags;
}
#else
static inline void copy_peer_flags_tlv( static inline void copy_peer_flags_tlv(
wmi_peer_assoc_complete_cmd_fixed_param * cmd, wmi_peer_assoc_complete_cmd_fixed_param * cmd,
struct peer_assoc_params *param) struct peer_assoc_params *param)
@@ -2383,6 +2375,8 @@ static inline void copy_peer_flags_tlv(
cmd->peer_flags |= WMI_PEER_VHT; cmd->peer_flags |= WMI_PEER_VHT;
if (param->he_flag) if (param->he_flag)
cmd->peer_flags |= WMI_PEER_HE; cmd->peer_flags |= WMI_PEER_HE;
if (param->p2p_capable_sta)
cmd->peer_flags |= WMI_PEER_IS_P2P_CAPABLE;
} }
if (param->is_pmf_enabled) if (param->is_pmf_enabled)
@@ -2423,7 +2417,6 @@ static inline void copy_peer_flags_tlv(
if (param->twt_responder) if (param->twt_responder)
cmd->peer_flags |= WMI_PEER_TWT_RESP; cmd->peer_flags |= WMI_PEER_TWT_RESP;
} }
#endif
static inline void copy_peer_mac_addr_tlv( static inline void copy_peer_mac_addr_tlv(
wmi_peer_assoc_complete_cmd_fixed_param * cmd, wmi_peer_assoc_complete_cmd_fixed_param * cmd,