diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-09 23:18:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-09 23:18:24 -0400 |
| commit | e5a8a896f5180f2950695d2d0b79db348d200ca4 (patch) | |
| tree | 04adc57ae51a6d30a89ffae970770b81ee81fc23 /drivers/net/cxgb3 | |
| parent | bff38771e1065c7fc3de87e47ba366151eea573c (diff) | |
| parent | e594e96e8a14101a6decabf6746bd5186287debc (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/cxgb3')
| -rw-r--r-- | drivers/net/cxgb3/cxgb3_main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c index 8c381c696a3..ec05149a906 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c | |||
| @@ -670,8 +670,7 @@ static int setup_sge_qsets(struct adapter *adap) | |||
| 670 | struct port_info *pi = netdev_priv(dev); | 670 | struct port_info *pi = netdev_priv(dev); |
| 671 | 671 | ||
| 672 | pi->qs = &adap->sge.qs[pi->first_qset]; | 672 | pi->qs = &adap->sge.qs[pi->first_qset]; |
| 673 | for (j = pi->first_qset; j < pi->first_qset + pi->nqsets; | 673 | for (j = 0; j < pi->nqsets; ++j, ++qset_idx) { |
| 674 | ++j, ++qset_idx) { | ||
| 675 | set_qset_lro(dev, qset_idx, pi->rx_offload & T3_LRO); | 674 | set_qset_lro(dev, qset_idx, pi->rx_offload & T3_LRO); |
| 676 | err = t3_sge_alloc_qset(adap, qset_idx, 1, | 675 | err = t3_sge_alloc_qset(adap, qset_idx, 1, |
| 677 | (adap->flags & USING_MSIX) ? qset_idx + 1 : | 676 | (adap->flags & USING_MSIX) ? qset_idx + 1 : |