diff --git a/core/wma/inc/wma_api.h b/core/wma/inc/wma_api.h index 8cd816e770c1..2050bd76cdb7 100644 --- a/core/wma/inc/wma_api.h +++ b/core/wma/inc/wma_api.h @@ -301,23 +301,6 @@ QDF_STATUS wma_set_qpower_config(uint8_t vdev_id, uint8_t qpower); bool wma_is_service_enabled(WMI_SERVICE service_type); -#ifdef WLAN_FEATURE_LINK_LAYER_STATS -/** - * wma_tx_failure_cb() - TX failure callback - * @ctx: txrx context - * @num_msdu: number of msdu with the same status - * @tid: TID number - * @status: failure status - */ -void wma_tx_failure_cb(void *ctx, uint32_t num_msdu, - uint8_t tid, enum htt_tx_status status); -#else -static inline void wma_tx_failure_cb(void *ctx, uint32_t num_msdu, - uint8_t tid, enum htt_tx_status status) -{ -} -#endif - /** * wma_store_pdev() - store pdev * @wma_ctx: wma context diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h index 37f13d611e0c..5eb6397161c3 100644 --- a/core/wma/inc/wma_internal.h +++ b/core/wma/inc/wma_internal.h @@ -467,23 +467,6 @@ struct cdp_vdev *wma_find_vdev_by_id(tp_wma_handle wma, uint8_t vdev_id) return wma->interfaces[vdev_id].handle; } -/** - * wma_get_vdev_count() - Returns number of active vdev. - * @wma - wma handle - * - * Return: Returns valid vdev count. - */ -static inline uint8_t wma_get_vdev_count(tp_wma_handle wma) -{ - uint8_t vdev_count = 0, i; - - for (i = 0; i < wma->max_bssid; i++) { - if (wma->interfaces[i].handle) - vdev_count++; - } - return vdev_count; -} - bool wma_is_vdev_in_ap_mode(tp_wma_handle wma, uint8_t vdev_id); #ifdef QCA_IBSS_SUPPORT @@ -503,23 +486,6 @@ bool wma_is_vdev_in_ibss_mode(tp_wma_handle wma, uint8_t vdev_id) } #endif -/** - * wma_is_vdev_in_beaconning_mode() - check if vdev is in a beaconning mode - * @wma: wma handle - * @vdev_id: vdev id - * - * Helper function to know whether given vdev id - * is in a beaconning mode or not. - * - * Return: True if vdev needs to beacon. - */ -static inline -bool wma_is_vdev_in_beaconning_mode(tp_wma_handle wma, uint8_t vdev_id) -{ - return wma_is_vdev_in_ap_mode(wma, vdev_id) || - wma_is_vdev_in_ibss_mode(wma, vdev_id); -} - /** * wma_find_bssid_by_vdev_id() - Get the BSS ID corresponding to the vdev ID * @wma - wma handle @@ -785,8 +751,6 @@ QDF_STATUS wma_set_mcc_channel_time_quota void wma_set_linkstate(tp_wma_handle wma, tpLinkStateParams params); -void wma_unpause_vdev(tp_wma_handle wma); - QDF_STATUS wma_process_rate_update_indicate(tp_wma_handle wma, tSirRateUpdateInd * pRateUpdateParams); @@ -1001,10 +965,6 @@ QDF_STATUS wma_wow_enter(tp_wma_handle wma, tpSirHalWowlEnterParams info); QDF_STATUS wma_wow_exit(tp_wma_handle wma, tpSirHalWowlExitParams info); -void wma_calculate_and_update_conn_state(tp_wma_handle wma); -void wma_update_conn_state(tp_wma_handle wma, uint32_t conn_mask); -void wma_update_conn_state(tp_wma_handle wma, uint32_t conn_mask); - void wma_del_ts_req(tp_wma_handle wma, tDelTsParams *msg); void wma_aggr_qos_req(tp_wma_handle wma, diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c index c934378a01fb..2d86af3e7c2a 100644 --- a/core/wma/src/wma_data.c +++ b/core/wma/src/wma_data.c @@ -1248,38 +1248,6 @@ out: wma_send_msg(wma, WMA_SET_LINK_STATE_RSP, (void *)params, 0); } -/** - * wma_unpause_vdev - unpause all vdev - * @wma: wma handle - * - * unpause all vdev aftter resume/coming out of wow mode - * - * Return: none - */ -void wma_unpause_vdev(tp_wma_handle wma) -{ - int8_t vdev_id; - struct wma_txrx_node *iface; - - for (vdev_id = 0; vdev_id < wma->max_bssid; vdev_id++) { - if (!wma->interfaces[vdev_id].handle) - continue; - -#if defined(QCA_LL_LEGACY_TX_FLOW_CONTROL) || defined(QCA_LL_TX_FLOW_CONTROL_V2) - /* When host resume, by default, unpause all active vdev */ - if (wma_vdev_get_pause_bitmap(vdev_id)) { - cdp_fc_vdev_unpause(cds_get_context(QDF_MODULE_ID_SOC), - wma->interfaces[vdev_id].handle, - 0xffffffff); - wma_vdev_update_pause_bitmap(vdev_id, 0); - } -#endif /* QCA_LL_LEGACY_TX_FLOW_CONTROL */ - - iface = &wma->interfaces[vdev_id]; - iface->conn_state = false; - } -} - /** * wma_process_rate_update_indate() - rate update indication * @wma: wma handle diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index b778daac7cc7..2885a9315d95 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -2085,18 +2085,6 @@ wma_wow_get_pkt_proto_subtype(uint8_t *data, uint32_t len) } } -static inline bool wma_pkt_is_tcpv4_mcast(uint8_t *data, uint32_t length) -{ - return length >= WMA_IPV4_PKT_INFO_GET_MIN_LEN && - qdf_nbuf_data_is_ipv4_mcast_pkt(data); -} - -static inline bool wma_pkt_is_tcpv6_mcast(uint8_t *data, uint32_t length) -{ - return length >= WMA_IPV6_PKT_INFO_GET_MIN_LEN && - qdf_nbuf_data_is_ipv6_mcast_pkt(data); -} - static void wma_log_pkt_eapol(uint8_t *data, uint32_t length) { uint16_t pkt_len, key_len; @@ -2833,18 +2821,6 @@ int wma_pdev_resume_event_handler(void *handle, uint8_t *event, uint32_t len) return 0; } -/** - * wma_set_wow_bus_suspend() - set suspend flag - * @wma: wma handle - * @val: value - * - * Return: none - */ -static inline void wma_set_wow_bus_suspend(tp_wma_handle wma, int val) -{ - qdf_atomic_set(&wma->is_wow_bus_suspended, val); - wmi_set_is_wow_bus_suspended(wma->wmi_handle, val); -} /** * wma_wow_enter() - store enable/disable status for pattern @@ -2873,53 +2849,6 @@ QDF_STATUS wma_wow_exit(tp_wma_handle wma, tpSirHalWowlExitParams info) return QDF_STATUS_SUCCESS; } -/** - * wma_calculate_and_update_conn_state(): calculate each interfaces conn state - * @wma: validated wma handle - * - * Identifies any vdev that is up and not in ap mode as connected. - * stores this in the interfaces conn_state varible. - */ -void wma_calculate_and_update_conn_state(tp_wma_handle wma) -{ - int i; - - for (i = 0; i < wma->max_bssid; i++) { - wma->interfaces[i].conn_state = - !!(wma_is_vdev_up(i) && - !wma_is_vdev_in_ap_mode(wma, i)); - } -} - -/** - * wma_update_conn_state(): synchronize wma & hdd - * @wma: wma handle - * @conn_state: boolean array to populate - * @len: validation parameter - * - * populate interfaces conn_state with true if the interface - * is a connected client and wow will configure a pattern. - */ -void wma_update_conn_state(tp_wma_handle wma, uint32_t conn_mask) -{ - int i; - - for (i = 0; i < wma->max_bssid; i++) { - if (conn_mask & (1 << i)) - wma->interfaces[i].conn_state = true; - else - wma->interfaces[i].conn_state = false; - } - - if (wma->wow.magic_ptrn_enable) - return; - - for (i = 0; i < wma->max_bssid; i++) { - if (!wma->interfaces[i].ptrn_match_enable) - wma->interfaces[i].conn_state = false; - } -} - /** * wma_del_ts_req() - send DELTS request to fw * @wma: wma handle @@ -3976,21 +3905,6 @@ void wma_send_regdomain_info_to_fw(uint32_t reg_dmn, uint16_t regdmn2G, ret); } -/** - * wma_suspend_target_timeout() - Handles the target suspend timeout - * @is_self_recovery_enabled: Is self recovery enabled or not - * - * Return: NONE - */ -static inline void wma_suspend_target_timeout(bool is_self_recovery_enabled) -{ - if (cds_is_load_or_unload_in_progress()) - WMA_LOGE("%s: Module (un)loading; Ignoring suspend timeout", - __func__); - else - cds_trigger_recovery(QDF_SUSPEND_TIMEOUT); -} - #ifdef FEATURE_WLAN_TDLS /** * wma_tdls_event_handler() - handle TDLS event diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c index 2b2319f3d246..1008fa2d6b97 100644 --- a/core/wma/src/wma_utils.c +++ b/core/wma/src/wma_utils.c @@ -1857,60 +1857,6 @@ static inline int wma_peer_ps_evt_handler(void *handle, u_int8_t *event, } #endif -/** - * wma_tx_failure_cb() - TX failure callback - * @ctx: txrx context - * @num_msdu: number of msdu with the same status - * @tid: TID number - * @status: failure status - */ -void wma_tx_failure_cb(void *ctx, uint32_t num_msdu, - uint8_t tid, enum htt_tx_status status) -{ - tSirLLStatsResults *results; - struct sir_wifi_iface_tx_fail *tx_fail; - struct scheduler_msg sme_msg = { 0 }; - QDF_STATUS qdf_status; - tpAniSirGlobal mac = cds_get_context(QDF_MODULE_ID_PE); - - if (!mac) { - WMA_LOGD("%s: NULL mac ptr. Exiting", __func__); - return; - } - - if (!mac->sme.link_layer_stats_ext_cb) { - WMA_LOGD("%s: HDD callback is null", __func__); - return; - } - - results = qdf_mem_malloc(sizeof(tSirLLStatsResults) + - sizeof(struct sir_wifi_iface_tx_fail)); - if (results == NULL) { - WMA_LOGE("%s: Cannot allocate link layer stats.", __func__); - return; - } - - results->paramId = WMI_LL_STATS_EXT_TX_FAIL; - results->num_peers = 1; - results->peer_event_number = 1; - results->moreResultToFollow = 0; - - tx_fail = (struct sir_wifi_iface_tx_fail *)results->results; - tx_fail->tid = tid; - tx_fail->msdu_num = num_msdu; - tx_fail->status = status; - - sme_msg.type = eWMI_SME_LL_STATS_IND; - sme_msg.bodyptr = results; - sme_msg.bodyval = 0; - - qdf_status = scheduler_post_msg(QDF_MODULE_ID_SME, &sme_msg); - if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - WMA_LOGE("%s: Fail to post TX failure ind msg", __func__); - qdf_mem_free(results); - } -} - /** * wma_register_ll_stats_event_handler() - register link layer stats related * event handler