projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
carl9170 firmware: optimize tx_status hot-path
[carl9170fw.git]
/
carlfw
/
include
/
carl9170.h
diff --git
a/carlfw/include/carl9170.h
b/carlfw/include/carl9170.h
index 1a5c6cb8bd3eb039cf9938808b918b724f12195f..85ea1d2425bd5895915aff9525cb407a61f01bac 100644
(file)
--- a/
carlfw/include/carl9170.h
+++ b/
carlfw/include/carl9170.h
@@
-93,17
+93,15
@@
struct firmware_context_struct {
struct {
/* Hardware DMA queues */
struct dma_queue tx_queue[__AR9170_NUM_TX_QUEUES]; /* wlan tx queue */
struct {
/* Hardware DMA queues */
struct dma_queue tx_queue[__AR9170_NUM_TX_QUEUES]; /* wlan tx queue */
+ struct dma_queue tx_retry;
struct dma_queue rx_queue; /* wlan rx queue */
struct dma_queue rx_queue; /* wlan rx queue */
-#ifdef CONFIG_CARL9170FW_DELAYED_TX
- struct dma_queue tx_delay[__AR9170_NUM_TX_QUEUES];
- struct dma_queue tx_retry;
- unsigned int tx_trigger;
-#endif /* CONFIG_CARL9170FW_DELAYED_TX */
+ /* tx aggregate scheduling */
+ struct carl9170_tx_superframe *ampdu_prev[__AR9170_NUM_TX_QUEUES];
/* Hardware DMA queue unstuck/fix detection */
/* Hardware DMA queue unstuck/fix detection */
- unsigned int last_
tx_desc
_num[__AR9170_NUM_TX_QUEUES];
- struct
dma_desc *last_tx_desc
[__AR9170_NUM_TX_QUEUES];
+ unsigned int last_
super
_num[__AR9170_NUM_TX_QUEUES];
+ struct
carl9170_tx_superframe *last_super
[__AR9170_NUM_TX_QUEUES];
unsigned int mac_reset;
unsigned int soft_int;
unsigned int mac_reset;
unsigned int soft_int;
@@
-117,11
+115,6
@@
struct firmware_context_struct {
/* tx sequence control counters */
unsigned int sequence[CARL9170_INTF_NUM];
/* tx sequence control counters */
unsigned int sequence[CARL9170_INTF_NUM];
-#ifdef CONFIG_CARL9170FW_TX_AMPDU
- /* tx aggregate scheduling */
- struct carl9170_tx_superframe *ampdu_prev[__AR9170_NUM_TX_QUEUES];
-#endif /* CONFIG_CARL9170FW_TX_AMPDU */
-
#ifdef CONFIG_CARL9170FW_CAB_QUEUE
/* CAB */
struct dma_queue cab_queue[CARL9170_INTF_NUM];
#ifdef CONFIG_CARL9170FW_CAB_QUEUE
/* CAB */
struct dma_queue cab_queue[CARL9170_INTF_NUM];
@@
-189,9
+182,7
@@
struct firmware_context_struct {
unsigned int frequency;
unsigned int ht_settings;
unsigned int frequency;
unsigned int ht_settings;
-#ifdef CONFIG_CARL9170FW_PSM
struct carl9170_psm psm;
struct carl9170_psm psm;
-#endif /* CONFIG_CARL9170FW_PSM */
#endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
} phy;
#endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
} phy;