cxgb4vf: Fix bug where we were only allocating one queue in MSI mode

PATCH Applied Casey Leedom 2 participants 2 messages Jul 20, 2010

Subsystems (2)

Networking Network drivers

lore

Share & tools

lore

Casey Leedom

author

2010-07-20 16:07 UTC #0 lore raw

PATCH 2/3 cxgb4vf: Fix bug where we were only allocating one queue in MSI mode

Quoted 1 line

From 7e141cafe989958267803791aa1bcacfffe5cfb2 Mon Sep 17 00:00:00 2001

From: Casey Leedom <[email protected]>
Date: Mon, 19 Jul 2010 17:53:48 -0700
Subject: [PATCH net-next 2/3] cxgb4vf: Fix bug where we were only allocating one queue in MSI mode

Fix bug in setup_sge_queues() where we were incorrectly only allocating a single "Queue Set" for MSI mode.

Signed-off-by Casey Leedom <[email protected]>

---
 drivers/net/cxgb4vf/cxgb4vf_main.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

drivers/net/cxgb4vf/cxgb4vf_main.c +2 -4

index d065516..a165632 100644
@@ -533,10 +533,9 @@ static int setup_sge_queues(struct adapter *adapter)
 		struct port_info *pi = netdev_priv(dev);
 		struct sge_eth_rxq *rxq = &s->ethrxq[pi->first_qset];
 		struct sge_eth_txq *txq = &s->ethtxq[pi->first_qset];
-		int nqsets = (adapter->flags & USING_MSIX) ? pi->nqsets : 1;
 		int qs;
 
-		for (qs = 0; qs < nqsets; qs++, rxq++, txq++) {
+		for (qs = 0; qs < pi->nqsets; qs++, rxq++, txq++) {
 			err = t4vf_sge_alloc_rxq(adapter, &rxq->rspq, false,
 						 dev, msix++,
 						 &rxq->fl, t4vf_ethrx_handler);

@@ -565,10 +564,9 @@ static int setup_sge_queues(struct adapter *adapter)
 		struct port_info *pi = netdev_priv(dev);
 		struct sge_eth_rxq *rxq = &s->ethrxq[pi->first_qset];
 		struct sge_eth_txq *txq = &s->ethtxq[pi->first_qset];
-		int nqsets = (adapter->flags & USING_MSIX) ? pi->nqsets : 1;
 		int qs;
 
-		for (qs = 0; qs < nqsets; qs++, rxq++, txq++) {
+		for (qs = 0; qs < pi->nqsets; qs++, rxq++, txq++) {
 			IQ_MAP(s, rxq->rspq.abs_id) = &rxq->rspq;
 			EQ_MAP(s, txq->q.abs_id) = &txq->q;

Signature · 1 line

1.7.0.4

David Miller

maintainer Applied

2010-07-20 20:23 UTC #1 lore raw

From: Casey Leedom <[email protected]>
Date: Tue, 20 Jul 2010 08:59:30 -0700

Quoted 9 lines

Quoted 1 line
From 7e141cafe989958267803791aa1bcacfffe5cfb2 Mon Sep 17 00:00:00 2001
From: Casey Leedom <[email protected]>
Date: Mon, 19 Jul 2010 17:53:48 -0700
Subject: [PATCH net-next 2/3] cxgb4vf: Fix bug where we were only allocating one queue in MSI mode
Fix bug in setup_sge_queues() where we were incorrectly only allocating a single "Queue Set" for MSI mode.
Signed-off-by Casey Leedom <[email protected]>

Applied.