X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Fsrc%2Fdma.c;h=92a8a68b082331e66a3b565de5c3608b777d38a9;hb=592643728e9b7c37c918afee05df8142c6d7303e;hp=6b40e05b846db7aac851daf309464df8ab0b0cfe;hpb=65dd584c008fdc28e8398bacfdb311b19ae80507;p=carl9170fw.git diff --git a/carlfw/src/dma.c b/carlfw/src/dma.c index 6b40e05..92a8a68 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 - * Copyright 2009, 2010 Christian Lamparter + * Copyright 2009-2011 Christian Lamparter * * 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 @@ -78,6 +78,7 @@ void dma_init_descriptors(void) fw.pta.down_queue.head = fw.pta.down_queue.terminator = &dma_mem.terminator[i++]; for (j = 0; j < __AR9170_NUM_TX_QUEUES; j++) fw.wlan.tx_queue[j].head = fw.wlan.tx_queue[j].terminator = &dma_mem.terminator[i++]; + 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++]; @@ -96,13 +97,6 @@ void dma_init_descriptors(void) fw.wlan.ba_desc = &dma_mem.terminator[i++]; #endif /* CONFIG_CARL9170FW_HANDLE_BACK_REQ */ -#ifdef CONFIG_CARL9170FW_DELAYED_TX - fw.wlan.tx_retry.head = fw.wlan.tx_retry.terminator = &dma_mem.terminator[i++]; - - for (j = 0; j < __AR9170_NUM_TX_QUEUES; j++) - 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",