diff options
| author | David S. Miller <davem@davemloft.net> | 2013-11-05 00:33:53 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-11-05 00:33:53 +0400 |
| commit | 96635fbd0b6c9113a374333092f40fc34fccb4f7 (patch) | |
| tree | 10dfdf2a54b31601d1a3e87e3b0cc6ce0ce04922 /drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | |
| parent | 165148396d8a220c0fb62e30101ea99b0223864e (diff) | |
| parent | db62d7d96af627589d12ee4a05c24cd74c878941 (diff) | |
| download | linux-96635fbd0b6c9113a374333092f40fc34fccb4f7.tar.xz | |
Merge branch 'qlcnic'
Himanshu Madhani says:
====================
qlcnic: Multiple Tx queue support and code refactoring
This Patch series contains following changes
o Refactored code to calculate, validate and assign Tx/SDS rings for various modes of driver.
o Enhanced ethtool statistics for multi Tx queue on all supported adapters.
o Enable multiple Tx queue for 83xx and 84xx Series adapters.
o Register netdev for failed device state.
changes from v1 -> v2
o Dropped patch to replace inappropriate usage of kzalloc() with vzalloc().
Please apply to net-next.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c index 66c26cf7a2b8..e9c21e5d0ca9 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c @@ -236,7 +236,7 @@ int qlcnic_alloc_sw_resources(struct qlcnic_adapter *adapter) spin_lock_init(&rds_ring->lock); } - for (ring = 0; ring < adapter->max_sds_rings; ring++) { + for (ring = 0; ring < adapter->drv_sds_rings; ring++) { sds_ring = &recv_ctx->sds_rings[ring]; sds_ring->irq = adapter->msix_entries[ring].vector; sds_ring->adapter = adapter; |