mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-15 01:01:56 -04:00
qcacld-3.0: Remove unused code from wma
Remove unused members from wma_txrx_node, t_wma_handle structures and related code. Change-Id: Ia5b290e3367a894646f138cfeedcb9ab3012e9be CRs-Fixed: 2412738
This commit is contained in:
parent
65acfc134a
commit
5393734002
5 changed files with 3 additions and 108 deletions
|
|
@ -645,26 +645,6 @@ struct wma_version_info {
|
|||
u_int32_t revision;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct wma_wow - store wow patterns
|
||||
* @magic_ptrn_enable: magic pattern enable/disable
|
||||
* @wow_enable: wow enable/disable
|
||||
* @wow_enable_cmd_sent: is wow enable command sent to fw
|
||||
* @deauth_enable: is deauth wakeup enable/disable
|
||||
* @disassoc_enable: is disassoc wakeup enable/disable
|
||||
* @gtk_err_enable: is GTK error wakeup enable/disable
|
||||
*
|
||||
* This structure stores wow patterns and wow related parameters in host.
|
||||
*/
|
||||
struct wma_wow {
|
||||
bool magic_ptrn_enable;
|
||||
bool wow_enable;
|
||||
bool wow_enable_cmd_sent;
|
||||
bool deauth_enable;
|
||||
bool disassoc_enable;
|
||||
bool gtk_err_enable[WLAN_MAX_VDEVS];
|
||||
};
|
||||
|
||||
#ifdef WLAN_FEATURE_11W
|
||||
#define CMAC_IPN_LEN (6)
|
||||
#define WMA_IGTK_KEY_INDEX_4 (4)
|
||||
|
|
@ -747,10 +727,6 @@ struct roam_synch_frame_ind {
|
|||
* @nlo_match_evt_received: is nlo match event received or not
|
||||
* @pno_in_progress: is pno in progress or not
|
||||
* @plm_in_progress: is plm in progress or not
|
||||
* @ptrn_match_enable: is pattern match is enable or not
|
||||
* @num_wow_default_patterns: number of default wow patterns configured for vdev
|
||||
* @num_wow_user_patterns: number of user wow patterns configured for vdev
|
||||
* @conn_state: connection state
|
||||
* @beaconInterval: beacon interval
|
||||
* @llbCoexist: 11b coexist
|
||||
* @shortSlotTimeSupported: is short slot time supported or not
|
||||
|
|
@ -817,10 +793,6 @@ struct wma_txrx_node {
|
|||
#ifdef FEATURE_WLAN_ESE
|
||||
bool plm_in_progress;
|
||||
#endif
|
||||
bool ptrn_match_enable;
|
||||
uint8_t num_wow_default_patterns;
|
||||
uint8_t num_wow_user_patterns;
|
||||
bool conn_state;
|
||||
tSirMacBeaconInterval beaconInterval;
|
||||
uint8_t llbCoexist;
|
||||
uint8_t shortSlotTimeSupported;
|
||||
|
|
@ -869,19 +841,11 @@ struct wma_txrx_node {
|
|||
uint32_t mac_id;
|
||||
bool roaming_in_progress;
|
||||
int32_t roam_synch_delay;
|
||||
uint8_t nss_2g;
|
||||
uint8_t nss_5g;
|
||||
uint8_t wep_default_key_idx;
|
||||
struct sir_host_offload_req arp_offload_req;
|
||||
struct sir_host_offload_req ns_offload_req;
|
||||
#ifndef QCA_SUPPORT_CP_STATS
|
||||
struct sir_vdev_wow_stats wow_stats;
|
||||
#endif
|
||||
struct sme_rcpi_req *rcpi_req;
|
||||
#ifdef WLAN_FEATURE_11AX
|
||||
bool he_capable;
|
||||
uint32_t he_ops;
|
||||
#endif
|
||||
bool in_bmps;
|
||||
struct beacon_filter_param beacon_filter;
|
||||
bool beacon_filter_enabled;
|
||||
|
|
@ -1005,10 +969,8 @@ struct wma_wlm_stats_data {
|
|||
* @wma_hold_req_q_lock: Mutex for @wma_hold_req_queue
|
||||
* @vht_supp_mcs: VHT supported MCS
|
||||
* @is_fw_assert: is fw asserted
|
||||
* @wow: wow related patterns & parameters
|
||||
* @ack_work_ctx: Context for deferred processing of TX ACK
|
||||
* @powersave_mode: power save mode
|
||||
* @ptrn_match_enable_all_vdev: is pattern match is enable/disable
|
||||
* @pGetRssiReq: get RSSI request
|
||||
* @get_one_peer_info: When a "get peer info" request is active, is
|
||||
* the request for a single peer?
|
||||
|
|
@ -1142,10 +1104,8 @@ typedef struct {
|
|||
qdf_spinlock_t wma_hold_req_q_lock;
|
||||
uint32_t vht_supp_mcs;
|
||||
uint8_t is_fw_assert;
|
||||
struct wma_wow wow;
|
||||
struct wma_tx_ack_work_ctx *ack_work_ctx;
|
||||
uint8_t powersave_mode;
|
||||
bool ptrn_match_enable_all_vdev;
|
||||
void *pGetRssiReq;
|
||||
bool get_one_peer_info;
|
||||
bool get_sta_peer_info;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2017-2018 The Linux Foundation. All rights reserved.
|
||||
* Copyright (c) 2017-2019 The Linux Foundation. All rights reserved.
|
||||
*
|
||||
* Permission to use, copy, modify, and/or distribute this software for
|
||||
* any purpose with or without fee is hereby granted, provided that the
|
||||
|
|
@ -135,16 +135,6 @@ void wma_populate_peer_he_cap(struct peer_assoc_params *peer,
|
|||
void wma_update_vdev_he_ops(struct wma_vdev_start_req *req,
|
||||
tpAddBssParams add_bss);
|
||||
|
||||
/**
|
||||
* wma_copy_txrxnode_he_ops() - copy HE ops from vdev start req to txrx node
|
||||
* @node: pointer to txrx node
|
||||
* @req: pointer to vdev start request
|
||||
*
|
||||
* Return: None
|
||||
*/
|
||||
void wma_copy_txrxnode_he_ops(struct wma_txrx_node *node,
|
||||
struct wma_vdev_start_req *req);
|
||||
|
||||
/**
|
||||
* wma_copy_vdev_start_he_ops() - copy HE ops from vdev start req to vdev start
|
||||
* @params: pointer to vdev_start_params
|
||||
|
|
@ -287,10 +277,6 @@ static inline void wma_update_vdev_he_ops(struct wma_vdev_start_req *req,
|
|||
tpAddBssParams add_bss)
|
||||
{
|
||||
}
|
||||
static inline void wma_copy_txrxnode_he_ops(struct wma_txrx_node *intr,
|
||||
struct wma_vdev_start_req *req)
|
||||
{
|
||||
}
|
||||
|
||||
static inline void wma_copy_vdev_start_he_ops(struct vdev_start_params *params,
|
||||
struct wma_vdev_start_req *req)
|
||||
|
|
|
|||
|
|
@ -2659,12 +2659,6 @@ __wma_handle_vdev_stop_rsp(wmi_vdev_stopped_event_fixed_param *resp_event)
|
|||
if (iface->type == WMI_VDEV_TYPE_STA)
|
||||
wma_get_cca_stats(wma, resp_event->vdev_id);
|
||||
|
||||
/* Clear arp and ns offload cache */
|
||||
qdf_mem_zero(&iface->ns_offload_req,
|
||||
sizeof(iface->ns_offload_req));
|
||||
qdf_mem_zero(&iface->arp_offload_req,
|
||||
sizeof(iface->arp_offload_req));
|
||||
|
||||
status = wma_remove_bss_peer(wma, pdev, resp_event->vdev_id,
|
||||
params);
|
||||
if (status != 0) {
|
||||
|
|
@ -2899,14 +2893,6 @@ struct cdp_vdev *wma_vdev_attach(tp_wma_handle wma_handle,
|
|||
}
|
||||
|
||||
wma_handle->interfaces[vdev_id].vdev = vdev;
|
||||
wma_handle->interfaces[vdev_id].ptrn_match_enable =
|
||||
wma_handle->ptrn_match_enable_all_vdev ? true : false;
|
||||
|
||||
wma_handle->wow.deauth_enable =
|
||||
ucfg_pmo_is_wowlan_deauth_enabled(wma_handle->psoc);
|
||||
|
||||
wma_handle->wow.disassoc_enable =
|
||||
ucfg_pmo_is_wowlan_disassoc_enabled(wma_handle->psoc);
|
||||
|
||||
qdf_mem_copy(wma_handle->interfaces[vdev_id].addr,
|
||||
self_sta_req->self_mac_addr,
|
||||
|
|
@ -3377,7 +3363,6 @@ QDF_STATUS wma_vdev_start(tp_wma_handle wma,
|
|||
intr[params.vdev_id].mhz = params.channel.mhz;
|
||||
intr[params.vdev_id].chan_width = ch_width;
|
||||
intr[params.vdev_id].channel = req->chan;
|
||||
wma_copy_txrxnode_he_ops(&intr[params.vdev_id], req);
|
||||
|
||||
temp_chan_info &= 0xffffffc0;
|
||||
temp_chan_info |= params.channel.phy_mode;
|
||||
|
|
@ -6226,11 +6211,6 @@ void wma_delete_bss_ho_fail(tp_wma_handle wma, tpDeleteBssParams params)
|
|||
qdf_mem_free(roam_scan_stats_req);
|
||||
}
|
||||
|
||||
qdf_mem_zero(&iface->ns_offload_req,
|
||||
sizeof(iface->ns_offload_req));
|
||||
qdf_mem_zero(&iface->arp_offload_req,
|
||||
sizeof(iface->arp_offload_req));
|
||||
|
||||
WMA_LOGD("%s, vdev_id: %d, pausing tx_ll_queue for VDEV_STOP (del_bss)",
|
||||
__func__, params->smesessionId);
|
||||
cdp_fc_vdev_pause(soc, iface->handle,
|
||||
|
|
|
|||
|
|
@ -1297,13 +1297,6 @@ void wma_update_vdev_he_ops(struct wma_vdev_start_req *req,
|
|||
req->he_ops = he_ops;
|
||||
}
|
||||
|
||||
void wma_copy_txrxnode_he_ops(struct wma_txrx_node *node,
|
||||
struct wma_vdev_start_req *req)
|
||||
{
|
||||
node->he_capable = req->he_capable;
|
||||
node->he_ops = req->he_ops;
|
||||
}
|
||||
|
||||
void wma_copy_vdev_start_he_ops(struct vdev_start_params *params,
|
||||
struct wma_vdev_start_req *req)
|
||||
{
|
||||
|
|
@ -1314,7 +1307,6 @@ void wma_vdev_set_he_bss_params(tp_wma_handle wma, uint8_t vdev_id,
|
|||
struct wma_vdev_start_req *req)
|
||||
{
|
||||
QDF_STATUS ret;
|
||||
struct wma_txrx_node *intr = wma->interfaces;
|
||||
|
||||
if (!req->he_capable)
|
||||
return;
|
||||
|
|
@ -1324,8 +1316,6 @@ void wma_vdev_set_he_bss_params(tp_wma_handle wma, uint8_t vdev_id,
|
|||
|
||||
if (QDF_IS_STATUS_ERROR(ret))
|
||||
WMA_LOGE(FL("Failed to set HE OPs"));
|
||||
else
|
||||
intr[vdev_id].he_ops = req->he_ops;
|
||||
}
|
||||
|
||||
void wma_vdev_set_he_config(tp_wma_handle wma, uint8_t vdev_id,
|
||||
|
|
|
|||
|
|
@ -2018,7 +2018,6 @@ static void wma_state_info_dump(char **buf_ptr, uint16_t *size)
|
|||
"\tipv6_mcast_ns %u\n"
|
||||
"\tipv6_mcast_na %u\n"
|
||||
"\toem_response %u\n"
|
||||
"conn_state %d\n"
|
||||
"dtimPeriod %d\n"
|
||||
"chanmode %d\n"
|
||||
"vht_capable %d\n"
|
||||
|
|
@ -2034,9 +2033,7 @@ static void wma_state_info_dump(char **buf_ptr, uint16_t *size)
|
|||
"nwType %d\n"
|
||||
"tx_streams %d\n"
|
||||
"rx_streams %d\n"
|
||||
"chain_mask %d\n"
|
||||
"nss_2g %d\n"
|
||||
"nss_5g %d",
|
||||
"chain_mask %d\n",
|
||||
vdev_id,
|
||||
stats.pno_match_wake_up_count,
|
||||
stats.pno_complete_wake_up_count,
|
||||
|
|
@ -2053,7 +2050,6 @@ static void wma_state_info_dump(char **buf_ptr, uint16_t *size)
|
|||
stats.ipv6_mcast_ns_stats,
|
||||
stats.ipv6_mcast_na_stats,
|
||||
stats.oem_response_wake_up_count,
|
||||
iface->conn_state,
|
||||
iface->dtimPeriod,
|
||||
iface->chanmode,
|
||||
iface->vht_capable,
|
||||
|
|
@ -2069,9 +2065,7 @@ static void wma_state_info_dump(char **buf_ptr, uint16_t *size)
|
|||
iface->nwType,
|
||||
iface->tx_streams,
|
||||
iface->rx_streams,
|
||||
iface->chain_mask,
|
||||
iface->nss_2g,
|
||||
iface->nss_5g);
|
||||
iface->chain_mask);
|
||||
wlan_objmgr_vdev_release_ref(vdev, WLAN_LEGACY_WMA_ID);
|
||||
}
|
||||
|
||||
|
|
@ -3194,7 +3188,6 @@ QDF_STATUS wma_open(struct wlan_objmgr_psoc *psoc,
|
|||
bool val = 0;
|
||||
void *cds_context;
|
||||
target_resource_config *wlan_res_cfg;
|
||||
enum pmo_wow_enable_type wow_enable;
|
||||
uint8_t delay_before_vdev_stop;
|
||||
uint32_t self_gen_frm_pwr = 0;
|
||||
|
||||
|
|
@ -3575,20 +3568,6 @@ QDF_STATUS wma_open(struct wlan_objmgr_psoc *psoc,
|
|||
wma_handle->staDynamicDtim =
|
||||
ucfg_pmo_get_sta_dynamic_dtim(wma_handle->psoc);
|
||||
|
||||
/*
|
||||
* Value of cds_cfg->wow_enable can be,
|
||||
* 0 - Disable both magic pattern match and pattern byte match.
|
||||
* 1 - Enable magic pattern match on all interfaces.
|
||||
* 2 - Enable pattern byte match on all interfaces.
|
||||
* 3 - Enable both magic patter and pattern byte match on
|
||||
* all interfaces.
|
||||
*/
|
||||
wow_enable = ucfg_pmo_get_wow_enable(wma_handle->psoc);
|
||||
wma_handle->wow.magic_ptrn_enable =
|
||||
(wow_enable & 0x01) ? true : false;
|
||||
wma_handle->ptrn_match_enable_all_vdev =
|
||||
(wow_enable & 0x02) ? true : false;
|
||||
|
||||
/* register for install key completion event */
|
||||
wmi_unified_register_event_handler(wma_handle->wmi_handle,
|
||||
wmi_vdev_install_key_complete_event_id,
|
||||
|
|
|
|||
Loading…
Reference in a new issue