From 53ffdd36b977e74e108bb03c4bd868ae698bd67f Mon Sep 17 00:00:00 2001 From: Samanth Manjunath Date: Fri, 5 Jun 2020 21:23:42 -0700 Subject: [PATCH] qcacmn: WLAN SON related functions cleanup Code clean up and removal of WLAN SON related functions which were unused. Change-Id: Icb4fddc9ca9dee8735e91f6772d9978b69a01726 CRs-Fixed: 2703210 --- target_if/son/inc/target_if_son.h | 33 +---------- target_if/son/src/target_if_son.c | 95 ++----------------------------- 2 files changed, 5 insertions(+), 123 deletions(-) diff --git a/target_if/son/inc/target_if_son.h b/target_if/son/inc/target_if_son.h index f63807da05fe..fabf1ac30f6d 100644 --- a/target_if/son/inc/target_if_son.h +++ b/target_if/son/inc/target_if_son.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2017,2020 The Linux Foundation. All rights reserved. * * * Permission to use, copy, modify, and/or distribute this software for @@ -25,39 +25,8 @@ void target_if_son_register_tx_ops(struct wlan_lmac_if_tx_ops *tx_ops); -bool son_ol_is_peer_inact(struct wlan_objmgr_peer *); - u_int32_t son_ol_get_peer_rate(struct wlan_objmgr_peer *peer, u_int8_t type); -int8_t son_ol_sanitize_util_invtl(struct wlan_objmgr_pdev *pdev, - u_int32_t *sample_period, - u_int32_t *num_of_sample); - -bool son_ol_enable(struct wlan_objmgr_pdev *pdev, bool enable); - -/* Function pointer to set overload status */ - -void son_ol_set_overload(struct wlan_objmgr_pdev *pdev, bool overload); - -/* Function pointer to set band steering parameters */ - -bool son_ol_set_params(struct wlan_objmgr_pdev *pdev, - u_int32_t inactivity_check_period, - u_int32_t inactivity_threshold_normal, - u_int32_t inactivity_threshold_overload); - QDF_STATUS son_ol_send_null(struct wlan_objmgr_pdev *pdev, u_int8_t *macaddr, struct wlan_objmgr_vdev *vdev); - -int son_ol_lmac_create(struct wlan_objmgr_pdev *pdev); - - -int son_ol_lmac_destroy(struct wlan_objmgr_pdev *pdev); - - -void son_ol_rx_rssi_update(struct wlan_objmgr_pdev *pdev, u_int8_t *macaddres, - u_int8_t status, int8_t rssi, u_int8_t subtype); - -void son_ol_rx_rate_update(struct wlan_objmgr_pdev *pdev, u_int8_t *macaddres, - u_int8_t status, u_int32_t rateKbps); diff --git a/target_if/son/src/target_if_son.c b/target_if/son/src/target_if_son.c index d41ab7104187..94a5563013d5 100644 --- a/target_if/son/src/target_if_son.c +++ b/target_if/son/src/target_if_son.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2020 The Linux Foundation. All rights reserved. * * * Permission to use, copy, modify, and/or distribute this software for @@ -30,19 +30,6 @@ u_int32_t son_ol_get_peer_rate(struct wlan_objmgr_peer *peer, u_int8_t type) return ol_if_peer_get_rate(peer, type); } - -bool son_ol_enable(struct wlan_objmgr_pdev *pdev, bool enable) -{ - return true; -} - -int8_t son_ol_sanitize_util_invtl(struct wlan_objmgr_pdev *pdev, - u_int32_t *sample_period, - u_int32_t *num_of_sample) -{ - return 0; -} - QDF_STATUS son_ol_send_null(struct wlan_objmgr_pdev *pdev, u_int8_t *macaddr, struct wlan_objmgr_vdev *vdev) @@ -65,66 +52,24 @@ QDF_STATUS son_ol_send_null(struct wlan_objmgr_pdev *pdev, return wmi_unified_stats_request_send(wmi_handle, macaddr, ¶m); } -int son_ol_lmac_create(struct wlan_objmgr_pdev *pdev) -{ - return 0; -} - -int son_ol_lmac_destroy(struct wlan_objmgr_pdev *pdev) -{ - return 0; - -} - -void son_ol_rx_rssi_update(struct wlan_objmgr_pdev *pdev, u_int8_t *macaddres, - u_int8_t status, int8_t rssi, u_int8_t subtype) -{ - return; - -} - -void son_ol_rx_rate_update(struct wlan_objmgr_pdev *pdev, u_int8_t *macaddres, - u_int8_t status, u_int32_t rateKbps) -{ - return; -} - void target_if_son_register_tx_ops(struct wlan_lmac_if_tx_ops *tx_ops) { /* wlan son related function handler */ - tx_ops->son_tx_ops.son_enable = son_ol_enable; - tx_ops->son_tx_ops.lmac_create = son_ol_lmac_create; - tx_ops->son_tx_ops.lmac_destroy = son_ol_lmac_destroy; tx_ops->son_tx_ops.son_send_null = son_ol_send_null; - tx_ops->son_tx_ops.son_rssi_update = son_ol_rx_rssi_update; - tx_ops->son_tx_ops.son_rate_update = son_ol_rx_rate_update; - tx_ops->son_tx_ops.son_sanity_util_intvl = son_ol_sanitize_util_invtl; tx_ops->son_tx_ops.get_peer_rate = son_ol_get_peer_rate; return; } -#else -void target_if_son_register_tx_ops(struct wlan_lmac_if_tx_ops *tx_ops) -{ - return; -} -int8_t son_ol_sanitize_util_intvl(struct wlan_objmgr_pdev *pdev, - u_int32_t *sample_period, - u_int32_t *num_of_sample) -{ - return -EINVAL; -} +#else u_int32_t son_ol_get_peer_rate(struct wlan_objmgr_peer *peer, u_int8_t type) { return 0; } - -bool son_ol_enable(struct wlan_objmgr_pdev *pdev, bool enable) +void target_if_son_register_tx_ops(struct wlan_lmac_if_tx_ops *tx_ops) { - return -EINVAL; - + return; } QDF_STATUS son_ol_send_null(struct wlan_objmgr_pdev *pdev, @@ -133,37 +78,5 @@ QDF_STATUS son_ol_send_null(struct wlan_objmgr_pdev *pdev, { return QDF_STATUS_SUCCESS; } -int8_t son_ol_sanitize_util_invtl(struct wlan_objmgr_pdev *pdev, - u_int32_t *sample_period, - u_int32_t *num_of_sample) -{ - return 0; -} - -int son_ol_lmac_create(struct wlan_objmgr_pdev *pdev) -{ - return 0; -} - - -int son_ol_lmac_destroy(struct wlan_objmgr_pdev *pdev) -{ - return 0; - -} - - -void son_ol_rx_rssi_update(struct wlan_objmgr_pdev *pdev, u_int8_t *macaddres, - u_int8_t status, int8_t rssi, u_int8_t subtype) -{ - return; - -} - -void son_ol_rx_rate_update(struct wlan_objmgr_pdev *pdev, u_int8_t *macaddres, - u_int8_t status, u_int32_t rateKbps) -{ - return; -} #endif