carl9170 firmware: enable BA REQ responder by default

[carl9170fw.git] / carlfw / include / carl9170.h

diff --git a/carlfw/include/carl9170.h b/carlfw/include/carl9170.h
index 29e1e29c062d70b058665ba5396a2dcd6d0fda02..cbfa611b7e761ec2c6ae67b11ad6f668afac440e 100644 (file)
--- a/carlfw/include/carl9170.h
+++ b/carlfw/include/carl9170.h
@@ -3,7 +3,7 @@
  *
  * Firmware context definition
  *
- * Copyright 2009, 2010 Christian Lamparter <chunkeey@googlemail.com>
+ * Copyright 2009-2011 Christian Lamparter <chunkeey@googlemail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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 dma_queue tx_retry;
                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 */
-               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;
 
@@ -117,11 +115,6 @@ struct firmware_context_struct {
                /* 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];
@@ -136,14 +129,12 @@ struct firmware_context_struct {
                             tx_status_tail_idx;
                struct carl9170_tx_status tx_status_cache[CARL9170_TX_STATUS_NUM];
 
-#ifdef CONFIG_CARL9170FW_HANDLE_BACK_REQ
                /* BA(R) Request Handler */
                struct dma_desc *ba_desc;
                struct carl9170_bar_ctx ba_cache[CONFIG_CARL9170FW_BACK_REQS_NUM];
                unsigned int ba_desc_available,
                             ba_tail_idx,
                             ba_head_idx;
-#endif /* CONFIG_CARL9170FW_HANDLE_BACK_REQ */
        } wlan;
 
        struct {
@@ -189,9 +180,7 @@ struct firmware_context_struct {
                unsigned int frequency;
                unsigned int ht_settings;
 
-#ifdef CONFIG_CARL9170FW_PSM
                struct carl9170_psm psm;
-#endif /* CONFIG_CARL9170FW_PSM */
 #endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
        } phy;