diff options
| author | Himanshu Madhani <himanshu.madhani@qlogic.com> | 2013-08-21 11:24:12 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-21 12:17:18 -0700 |
| commit | c2c5e3a0681bb1945c0cb211a5f4baa22cb2cbb3 (patch) | |
| tree | 860a3508236f72db6dc15599d568c909208065c7 /drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | |
| parent | aa4a1f7df7cbb98797c9f4edfde3c726e2b3841f (diff) | |
| download | blackbird-op-linux-c2c5e3a0681bb1945c0cb211a5f4baa22cb2cbb3.tar.gz blackbird-op-linux-c2c5e3a0681bb1945c0cb211a5f4baa22cb2cbb3.zip | |
qlcnic: Enable diagnostic test for multiple Tx queues.
o Enable diagnostic test via ethtool and QConvergeConsole
application when Multiple Tx queues are enabled on 82xx
series adapters.
Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com>
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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c index 240b49f5936b..66c26cf7a2b8 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c @@ -242,7 +242,8 @@ int qlcnic_alloc_sw_resources(struct qlcnic_adapter *adapter) sds_ring->adapter = adapter; sds_ring->num_desc = adapter->num_rxd; if (qlcnic_82xx_check(adapter)) { - if (qlcnic_check_multi_tx(adapter)) + if (qlcnic_check_multi_tx(adapter) && + !adapter->ahw->diag_test) sds_ring->tx_ring = &adapter->tx_ring[ring]; else sds_ring->tx_ring = &adapter->tx_ring[0]; |
