X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Fsrc%2Fdma.c;h=73b10966fd14d367ac856135e4b4137293449c89;hb=12d3f1ba6ba522cd1ef11483d813fe2c2e64f04b;hp=dc4d2785ac4175fd1ca93cda5c29eba89ba59d63;hpb=fce55bd78997d0363c1029d90e62eb1de8a5ba6d;p=carl9170fw.git

diff --git a/carlfw/src/dma.c b/carlfw/src/dma.c
index dc4d278..73b1096 100644
--- a/carlfw/src/dma.c
+++ b/carlfw/src/dma.c
@@ -6,7 +6,7 @@
  * Copyright (c) 2000-2005 ZyDAS Technology Corporation
  * Copyright (c) 2007-2009 Atheros Communications, Inc.
  * Copyright	2009	Johannes Berg <johannes@sipsolutions.net>
- * 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
@@ -82,7 +82,14 @@ void dma_init_descriptors(void)
 	fw.usb.int_desc = &dma_mem.terminator[i++];
 
 #ifdef CONFIG_CARL9170FW_CAB_QUEUE
-	fw.wlan.cab_queue.head = fw.wlan.cab_queue.terminator = &dma_mem.terminator[i++];
+	/* 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 */
 
 #ifdef CONFIG_CARL9170FW_HANDLE_BACK_REQ
@@ -96,6 +103,8 @@ void dma_init_descriptors(void)
 		fw.wlan.tx_delay[j].head = fw.wlan.tx_delay[j].terminator = &dma_mem.terminator[i++];
 #endif /* CONFIG_CARL9170FW_DELAYED_TX */
 
+	BUILD_BUG_ON(AR9170_TERMINATOR_NUMBER != j);
+
 	DBG("Blocks:%d [tx:%d, rx:%d] Terminators:%d/%d\n",
 	    AR9170_BLOCK_NUMBER, AR9170_TX_BLOCK_NUMBER,
 	    AR9170_RX_BLOCK_NUMBER, AR9170_TERMINATOR_NUMBER, i);