renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 12:43:55 +08:00
Code

mwl8k: don't hardcode the number of transmit queues

Browse Source 
Use MWL8K_TX_QUEUES instead of a hardcoded "4" in a couple of places.

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Lennert Buytenhek 2009-08-18 04:15:22 +02:00 committed by John W. Linville
parent d4b7057052
commit c3f967d301
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/wireless/mwl8k.c
View File

@ -1080,17 +1080,17 @@ struct mwl8k_txq_info {
}; };
static int mwl8k_scan_tx_ring(struct mwl8k_priv *priv, static int mwl8k_scan_tx_ring(struct mwl8k_priv *priv,
struct mwl8k_txq_info txinfo[], struct mwl8k_txq_info *txinfo)
u32 num_queues)
{ {
int count, desc, status; int count, desc, status;
struct mwl8k_tx_queue *txq; struct mwl8k_tx_queue *txq;
struct mwl8k_tx_desc *tx_desc; struct mwl8k_tx_desc *tx_desc;
int ndescs = 0; int ndescs = 0;
memset(txinfo, 0, num_queues * sizeof(struct mwl8k_txq_info)); memset(txinfo, 0, MWL8K_TX_QUEUES * sizeof(struct mwl8k_txq_info));
spin_lock_bh(&priv->tx_lock); spin_lock_bh(&priv->tx_lock);
for (count = 0; count < num_queues; count++) { for (count = 0; count < MWL8K_TX_QUEUES; count++) {
txq = priv->txq + count; txq = priv->txq + count;
txinfo[count].len = txq->tx_stats.len; txinfo[count].len = txq->tx_stats.len;
txinfo[count].head = txq->tx_head; txinfo[count].head = txq->tx_head;
@ -1135,7 +1135,7 @@ static int mwl8k_tx_wait_empty(struct ieee80211_hw *hw, u32 delay_ms)
spin_unlock_bh(&priv->tx_lock); spin_unlock_bh(&priv->tx_lock);
if (count) { if (count) {
struct mwl8k_txq_info txinfo[4]; struct mwl8k_txq_info txinfo[MWL8K_TX_QUEUES];
int index; int index;
int newcount; int newcount;
@ -1152,8 +1152,8 @@ static int mwl8k_tx_wait_empty(struct ieee80211_hw *hw, u32 delay_ms)
printk(KERN_ERR "%s(%u) TIMEDOUT:%ums Pend:%u-->%u\n", printk(KERN_ERR "%s(%u) TIMEDOUT:%ums Pend:%u-->%u\n",
__func__, __LINE__, delay_ms, count, newcount); __func__, __LINE__, delay_ms, count, newcount);
mwl8k_scan_tx_ring(priv, txinfo, 4); mwl8k_scan_tx_ring(priv, txinfo);
for (index = 0; index < 4; index++) for (index = 0; index < MWL8K_TX_QUEUES; index++)
printk(KERN_ERR printk(KERN_ERR
"TXQ:%u L:%u H:%u T:%u FW:%u DRV:%u U:%u\n", "TXQ:%u L:%u H:%u T:%u FW:%u DRV:%u U:%u\n",
index, index,