carl9170 firmware: remove gcc workaround

[carl9170fw.git] / carlfw / src / dma.c

diff --git a/carlfw/src/dma.c b/carlfw/src/dma.c
index 18c57ce1392e45405a0a75f0a45a7a5429035e2e..7c077af511b9ea94a3857650d1cf7bd04dae9953 100644 (file)
--- a/carlfw/src/dma.c
+++ b/carlfw/src/dma.c
@@ -81,17 +81,11 @@ void dma_init_descriptors(void)
        fw.wlan.tx_retry.head = fw.wlan.tx_retry.terminator = &dma_mem.terminator[i++];
        fw.wlan.rx_queue.head = fw.wlan.rx_queue.terminator = &dma_mem.terminator[i++];
        fw.usb.int_desc = &dma_mem.terminator[i++];
-       fw.wlan.ba_desc = &dma_mem.terminator[i++];
+       fw.wlan.fw_desc = &dma_mem.terminator[i++];
 
 #ifdef CONFIG_CARL9170FW_CAB_QUEUE
-       /* GCC bug ? */
-# if (CARL9170_INTF_NUM != 2)
        for (j = 0; j < CARL9170_INTF_NUM; j++)
                fw.wlan.cab_queue[j].head = fw.wlan.cab_queue[j].terminator = &dma_mem.terminator[i++];
-#else
-       fw.wlan.cab_queue[0].head = fw.wlan.cab_queue[0].terminator = &dma_mem.terminator[i++];
-       fw.wlan.cab_queue[1].head = fw.wlan.cab_queue[1].terminator = &dma_mem.terminator[i++];
-#endif
 #endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
        BUILD_BUG_ON(AR9170_TERMINATOR_NUMBER != j);
@@ -120,7 +114,6 @@ void dma_init_descriptors(void)
                set_wlan_txq_dma_addr(i, (uint32_t) fw.wlan.tx_queue[i].head);
 
        set(AR9170_MAC_REG_DMA_RXQ_ADDR, (uint32_t) fw.wlan.rx_queue.head);
-
        fw.usb.int_desc->dataSize = AR9170_BLOCK_SIZE;
        fw.usb.int_desc->dataAddr = (void *) &dma_mem.reserved.rsp;
 
@@ -132,9 +125,8 @@ void dma_init_descriptors(void)
        /* rsp is now available for use */
        fw.usb.int_desc_available = 1;
 
-       fw.wlan.ba_desc->dataAddr = (void *) &dma_mem.reserved.ba;
-       memset(DESC_PAYLOAD(fw.wlan.ba_desc), 0, 128);
-       fw.wlan.ba_desc_available = 1;
+       memset(DESC_PAYLOAD(fw.wlan.fw_desc), 0, 128);
+       fw.wlan.fw_desc_available = 1;
 }
 
 /*