Merge branch 'master' into radar

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

diff --git a/carlfw/include/carl9170.h b/carlfw/include/carl9170.h
index 300d291a1c97d2a0e475813b7df3ca9e21aafe75..ed5120df22ba1b88a0e07358e0d740ee2694cd48 100644 (file)
--- a/carlfw/include/carl9170.h
+++ b/carlfw/include/carl9170.h
@@ -42,13 +42,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,
@@ -118,13 +116,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,
@@ -146,9 +142,11 @@ struct firmware_context_struct {
 
                unsigned int queued_bar;
 
+#ifdef CONFIG_CARL9170FW_RADAR
                unsigned int soft_radar,
                             radar_last,
                             pattern_index;
+#endif /* CONFIG_CARL9170FW_RADAR */
        } wlan;
 
        struct {