From 9eaa6f099b33e8af804e17bd61efa56d080ce153 Mon Sep 17 00:00:00 2001 From: Manjunathappa Prakash Date: Fri, 23 Mar 2018 17:23:15 -0700 Subject: [PATCH] qcacmn: Remove redefinition of *tx_flow_control_fp ol_txrx_tx_flow_control_fp and ol_txrx_tx_flow_control_is_pause_fp are redefined dp/inc/cdp_txrx_mob_def.h, original definition is in dp/inc/cdp_txrx_cmn_struct.h. Remove duplicate redefinition. Change-Id: I2c2af59d8b24360cd09efeb12ea19c0340771bb8 CRs-Fixed: 2215678 --- dp/inc/cdp_txrx_mob_def.h | 26 -------------------------- utils/fwlog/dbglog_host.h | 2 +- 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/dp/inc/cdp_txrx_mob_def.h b/dp/inc/cdp_txrx_mob_def.h index 0a6a6130cb11..96b73f132cb2 100644 --- a/dp/inc/cdp_txrx_mob_def.h +++ b/dp/inc/cdp_txrx_mob_def.h @@ -407,32 +407,6 @@ struct ieee80211_delba_parameterset { typedef void (*ol_txrx_vdev_peer_remove_cb)(void *handle, uint8_t *bssid, uint8_t vdev_id, void *peer); -/** - * ol_txrx_tx_flow_control_fp - tx flow control notification - * function from txrx to OS shim - * @osif_dev - the virtual device's OS shim object - * @tx_resume - tx os q should be resumed or not - */ -typedef void (*ol_txrx_tx_flow_control_fp)(void *osif_dev, bool tx_resume); - -/** - * ol_txrx_tx_flow_control_is_pause_fp - is tx paused by flow control - * function from txrx to OS shim - * @osif_dev - the virtual device's OS shim object - * - * Return: true if tx is paused by flow control - */ -typedef bool (*ol_txrx_tx_flow_control_is_pause_fp)(void *osif_dev); - -/** - * ol_txrx_tx_flow_control_fp - tx flow control notification - * function from txrx to OS shim - * @osif_dev - the virtual device's OS shim object - * @tx_resume - tx os q should be resumed or not - */ -typedef void (*tx_flow_control_fp)(void *osif_dev, - bool tx_resume); - /** * @typedef tx_pause_callback * @brief OSIF function registered with the data path diff --git a/utils/fwlog/dbglog_host.h b/utils/fwlog/dbglog_host.h index 3e62f29d0b5a..a53a920ec616 100644 --- a/utils/fwlog/dbglog_host.h +++ b/utils/fwlog/dbglog_host.h @@ -33,7 +33,7 @@ extern "C" { #endif #include "dbglog_common.h" -#include "ol_defines.h" +#include "wmi_unified_param.h" #define DIAG_FWID_OFFSET 24 #define DIAG_FWID_MASK 0xFF000000 /* Bit 24-31 */