carl9170 firmware: 5/10 MHz Channel Support for carl9170

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

diff --git a/carlfw/include/carl9170.h b/carlfw/include/carl9170.h
index d10a74e8064448eebbb60502a53b23c1bc7744ad..26d247bb6d752f634345b1b7f2420a00b7499f6f 100644 (file)
--- a/carlfw/include/carl9170.h
+++ b/carlfw/include/carl9170.h
@@ -41,13 +41,11 @@ struct carl9170_bar_ctx {
        __le16 control;
 };
 
-#ifdef CONFIG_CARL9170FW_CAB_QUEUE
 enum carl9170_cab_trigger {
        CARL9170_CAB_TRIGGER_EMPTY      = 0,
        CARL9170_CAB_TRIGGER_ARMED      = BIT(0),
        CARL9170_CAB_TRIGGER_DEFER      = BIT(1),
 };
-#endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
 enum carl9170_ep0_action {
        CARL9170_EP0_NO_ACTION          = 0,
@@ -117,13 +115,11 @@ struct firmware_context_struct {
                /* tx sequence control counters */
                unsigned int sequence[CARL9170_INTF_NUM];
 
-#ifdef CONFIG_CARL9170FW_CAB_QUEUE
                /* CAB */
                struct dma_queue cab_queue[CARL9170_INTF_NUM];
                unsigned int cab_queue_len[CARL9170_INTF_NUM];
                unsigned int cab_flush_time;
                enum carl9170_cab_trigger cab_flush_trigger[CARL9170_INTF_NUM];
-#endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
                /* tx status */
                unsigned int tx_status_pending,
@@ -142,6 +138,8 @@ struct firmware_context_struct {
                unsigned int ba_tail_idx,
                             ba_head_idx,
                             queued_ba;
+
+               unsigned int queued_bar;
        } wlan;
 
        struct {
@@ -185,7 +183,7 @@ struct firmware_context_struct {
 
                /* PHY/RF state */
                unsigned int frequency;
-               unsigned int ht_settings;
+               unsigned int settings;
 
                enum carl9170_phy_state state;
                struct carl9170_psm psm;