carl9170 firmware: reorganize wlan context members

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

diff --git a/carlfw/include/carl9170.h b/carlfw/include/carl9170.h
index 2ae4f630e3d10e717c21b318d64d3b157cd0c183..1965674c2b866a7c19882372248cf493a9a087a2 100644 (file)
--- a/carlfw/include/carl9170.h
+++ b/carlfw/include/carl9170.h
@@ -45,9 +45,8 @@ struct carl9170_bar_ctx {
 #ifdef CONFIG_CARL9170FW_CAB_QUEUE
 enum carl9170_cab_trigger {
        CARL9170_CAB_TRIGGER_EMPTY      = 0,
-       CARL9170_CAB_TRIGGER_READY      = BIT(0),
-       CARL9170_CAB_TRIGGER_ARMED      = BIT(1),
-       CARL9170_CAB_TRIGGER_DEFER      = BIT(2),
+       CARL9170_CAB_TRIGGER_ARMED      = BIT(0),
+       CARL9170_CAB_TRIGGER_DEFER      = BIT(1),
 };
 #endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
@@ -71,7 +70,6 @@ enum carl9170_mac_reset_state {
 
 struct firmware_context_struct {
        /* timer / clocks */
-       unsigned int bogoclock;                 /* supposed to be CPU clock in KHz */
        unsigned int counter;                   /* main() cycles */
 
        /* misc */
@@ -98,9 +96,15 @@ struct firmware_context_struct {
                /* 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 mac_reset;
+               unsigned int soft_int;
+
+               /* rx filter */
+               unsigned int rx_filter;
+
+               /* rx statistics */
                unsigned int rx_total;
                unsigned int rx_overruns;
-               unsigned int mac_reset;
 
 #ifdef CONFIG_CARL9170FW_CAB_QUEUE
                /* CAB */