mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-11 15:11:48 -04:00
qcacld-3.0: Remove obsolete txrx.h
Almost all of the definitions in txrx.h are obsolete. Rather than remove the obsolete definitions and leave behind a file containing only the two definitions that are used, move those useful definitions to ol_txrx_types.h and completely remove txrx.h. A side effect of this change is that a couple of unrelated files no longer build because some of their dependencies were being met as a side effect by txrx.h including other files. To solve the build issues explicitly include the necessary header files where they are needed. Change-Id: Ic3e3b36939e4ab04831d41a1e230bfab3da086a2 CRs-Fixed: 2363231
This commit is contained in:
Jeff Johnson
nshrivas
parent
500bd72fc3
commit
8feaa63728
5 changed files with 20 additions and 189 deletions
|
|
@ -23,6 +23,8 @@
|
|||
#include "cdp_txrx_ipa.h"
|
||||
#include "wal_rx_desc.h"
|
||||
#include "qdf_str.h"
|
||||
#include "sir_api.h"
|
||||
#include "host_diag_core_event.h"
|
||||
|
||||
static struct wlan_ipa_priv *gp_ipa;
|
||||
|
||||
|
|
|
|||
|
|
@ -53,6 +53,7 @@
|
|||
#include <ol_txrx.h>
|
||||
#include <pktlog_ac_fmt.h>
|
||||
#include <cdp_txrx_handle.h>
|
||||
#include <wlan_reg_services_api.h>
|
||||
|
||||
#ifdef QCA_HL_NETDEV_FLOW_CONTROL
|
||||
static u16 ol_txrx_tx_desc_alloc_table[TXRX_FC_MAX] = {
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@
|
|||
#include <qdf_lock.h> /* qdf_spinlock */
|
||||
#include <pktlog.h> /* ol_pktlog_dev_handle */
|
||||
#include <ol_txrx_stats.h>
|
||||
#include <txrx.h>
|
||||
#include "ol_txrx_htt_api.h"
|
||||
#include "ol_htt_tx_api.h"
|
||||
#include "ol_htt_rx_api.h"
|
||||
|
|
@ -239,6 +238,18 @@ struct ol_rx_reorder_timeout_list_elem_t {
|
|||
uint8_t active;
|
||||
};
|
||||
|
||||
/* wait on peer deletion timeout value in milliseconds */
|
||||
#define PEER_DELETION_TIMEOUT 500
|
||||
|
||||
enum txrx_wmm_ac {
|
||||
TXRX_WMM_AC_BE,
|
||||
TXRX_WMM_AC_BK,
|
||||
TXRX_WMM_AC_VI,
|
||||
TXRX_WMM_AC_VO,
|
||||
|
||||
TXRX_NUM_WMM_AC
|
||||
};
|
||||
|
||||
#define TXRX_TID_TO_WMM_AC(_tid) ( \
|
||||
(((_tid) >> 1) == 3) ? TXRX_WMM_AC_VO : \
|
||||
(((_tid) >> 1) == 2) ? TXRX_WMM_AC_VI : \
|
||||
|
|
|
|||
|
|
@ -1,187 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2013-2017 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
|
||||
* above copyright notice and this permission notice appear in all
|
||||
* copies.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
|
||||
* WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
|
||||
* AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
|
||||
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
|
||||
* PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
||||
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
* PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#ifndef TXRX_H
|
||||
#define TXRX_H
|
||||
|
||||
#include "cds_api.h"
|
||||
#include "qdf_nbuf.h"
|
||||
#include "csr_api.h"
|
||||
#include "sap_api.h"
|
||||
#include "ol_txrx_osif_api.h"
|
||||
|
||||
/* wait on peer deletion timeout value in milliseconds */
|
||||
#define PEER_DELETION_TIMEOUT 500
|
||||
|
||||
enum txrx_wmm_ac {
|
||||
TXRX_WMM_AC_BE,
|
||||
TXRX_WMM_AC_BK,
|
||||
TXRX_WMM_AC_VI,
|
||||
TXRX_WMM_AC_VO,
|
||||
|
||||
TXRX_NUM_WMM_AC
|
||||
};
|
||||
|
||||
struct txrx_rx_metainfo {
|
||||
u8 up;
|
||||
u16 dest_staid;
|
||||
};
|
||||
|
||||
enum bt_frame_type {
|
||||
/* BT-AMP packet of type data */
|
||||
TXRX_BT_AMP_TYPE_DATA = 0x0001,
|
||||
|
||||
/* BT-AMP packet of type activity report */
|
||||
TXRX_BT_AMP_TYPE_AR = 0x0002,
|
||||
|
||||
/* BT-AMP packet of type security frame */
|
||||
TXRX_BT_AMP_TYPE_SEC = 0x0003,
|
||||
|
||||
/* BT-AMP packet of type Link Supervision request frame */
|
||||
TXRX_BT_AMP_TYPE_LS_REQ = 0x0004,
|
||||
|
||||
/* BT-AMP packet of type Link Supervision reply frame */
|
||||
TXRX_BT_AMP_TYPE_LS_REP = 0x0005,
|
||||
|
||||
/* Invalid Frame */
|
||||
TXRX_BAP_INVALID_FRAME
|
||||
};
|
||||
|
||||
enum wlan_ts_direction {
|
||||
/* uplink */
|
||||
WLAN_TX_DIR = 0,
|
||||
|
||||
/* downlink */
|
||||
WLAN_RX_DIR = 1,
|
||||
|
||||
/*bidirectional */
|
||||
WLAN_BI_DIR = 2,
|
||||
};
|
||||
|
||||
enum wlan_sta_state {
|
||||
/* Transition in this state made upon creation */
|
||||
WLAN_STA_INIT = 0,
|
||||
|
||||
/*
|
||||
* Transition happens after Assoc success if second level authentication
|
||||
* is needed
|
||||
*/
|
||||
WLAN_STA_CONNECTED,
|
||||
|
||||
/*
|
||||
* Transition happens when second level auth is successful and keys are
|
||||
* properly installed
|
||||
*/
|
||||
WLAN_STA_AUTHENTICATED,
|
||||
|
||||
/* Transition happens when connectivity is lost */
|
||||
WLAN_STA_DISCONNECTED,
|
||||
|
||||
WLAN_STA_MAX_STATE
|
||||
};
|
||||
|
||||
struct wlan_txrx_stats {
|
||||
/* Define various txrx stats here */
|
||||
};
|
||||
|
||||
struct ol_txrx_vdev_t;
|
||||
|
||||
QDF_STATUS wlan_register_mgmt_client(void *pdev_txrx,
|
||||
QDF_STATUS (*rx_mgmt)(void *g_cdsctx,
|
||||
void *buf));
|
||||
|
||||
/* If RSSI realm is changed, send notification to Clients, SME, HDD */
|
||||
typedef QDF_STATUS (*wlan_txrx_rssi_cross_thresh)(void *adapter, u8 rssi,
|
||||
void *usr_ctx,
|
||||
int8_t avg_rssi);
|
||||
|
||||
/* Rx callback registered with txrx */
|
||||
typedef int (*wlan_txrx_cb_type)(void *g_cdsctx, qdf_nbuf_t buf, u8 sta_id,
|
||||
struct txrx_rx_metainfo *rx_meta_info);
|
||||
|
||||
static inline int wlan_txrx_get_rssi(void *g_cdsctx, u8 sta_id, int8_t *rssi)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int wlan_txrx_enable_uapsd_ac(void *g_cdsctx, u8 sta_id,
|
||||
enum txrx_wmm_ac ac, u8 tid, u8 up,
|
||||
u32 srv_int, u32 suspend_int,
|
||||
enum wlan_ts_direction ts_dir)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int wlan_txrx_disable_uapsd_ac(void *g_cdsctx, u8 sta_id,
|
||||
enum txrx_wmm_ac ac)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int wlan_change_sta_state(void *g_cdsctx, u8 sta_id,
|
||||
enum wlan_sta_state state)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int wlan_deregister_mgmt_client(void *g_cdsctx)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline void wlan_assoc_failed(u8 staid)
|
||||
{
|
||||
}
|
||||
|
||||
static inline int wlan_get_ap_stats(void *g_cdsctx, tSap_SoftapStats *buf,
|
||||
bool reset)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int wlan_get_txrx_stats(void *g_cdsctx,
|
||||
struct wlan_txrx_stats *stats, u8 sta_id)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int wlan_txrx_update_rssi_bmps(void *g_cdsctx, u8 sta_id,
|
||||
int8_t rssi)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int wlan_txrx_deregister_rssi_indcb(void *g_cdsctx,
|
||||
int8_t rssi_val,
|
||||
u8 trigger_event,
|
||||
wlan_txrx_rssi_cross_thresh
|
||||
cb, int mod_id)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int wlan_txrx_register_rssi_indcb(void *g_cdsctx,
|
||||
int8_t rssi_val,
|
||||
u8 trigger_event,
|
||||
wlan_txrx_rssi_cross_thresh cb,
|
||||
int mod_id, void *usr_ctx)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2017 The Linux Foundation. All rights reserved.
|
||||
* Copyright (c) 2017-2018 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
|
||||
|
|
@ -26,6 +26,10 @@
|
|||
#include "cdp_txrx_cmn.h"
|
||||
#include "cdp_txrx_misc.h"
|
||||
#include "ol_txrx_types.h"
|
||||
#ifdef FEATURE_WLAN_DIAG_SUPPORT
|
||||
#include "host_diag_core_event.h"
|
||||
#include "host_diag_core_log.h"
|
||||
#endif /* FEATURE_WLAN_DIAG_SUPPORT */
|
||||
|
||||
#ifdef FEATURE_WLAN_DIAG_SUPPORT
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue