From bc706a55f739b9db52191e669e4c49b1645fc1e8 Mon Sep 17 00:00:00 2001 From: Casey Leedom Date: Mon, 19 Jul 2010 17:53:48 -0700 Subject: [PATCH] --- yaml --- r: 203651 b: refs/heads/master c: c8639a827fa48985432ad2e0e21b1280a1e3a65e h: refs/heads/master i: 203649: 18dcf9288ad47d61bcd5cdf949837975cea0385f 203647: de843dbee36a4dabd2bffe2551273dd55c2caec4 v: v3 --- [refs] | 2 +- trunk/drivers/net/cxgb4vf/cxgb4vf_main.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 6f3e827a6a26..976bef8b5420 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 024e6293f959dc86827284bc1d7c93c8baed1ec6 +refs/heads/master: c8639a827fa48985432ad2e0e21b1280a1e3a65e diff --git a/trunk/drivers/net/cxgb4vf/cxgb4vf_main.c b/trunk/drivers/net/cxgb4vf/cxgb4vf_main.c index d065516c0ffd..a16563219ac9 100644 --- a/trunk/drivers/net/cxgb4vf/cxgb4vf_main.c +++ b/trunk/drivers/net/cxgb4vf/cxgb4vf_main.c @@ -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;