diff options
| author |   Himanshu Madhani <himanshu.madhani@qlogic.com> | 2013-12-17 09:01:52 -0500 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-12-17 17:09:43 -0500 |
| commit | 80c0e4f3a3a43664b38477fa5d9e6b6149b34d80 (patch) | |
| tree | 53b9a703247d64fa8284b2e971a1916bc6d04aa3 /drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | |
| parent | qlcnic: Refactor initialize nic code path. (diff) | |
| download | linux-dev-80c0e4f3a3a43664b38477fa5d9e6b6149b34d80.tar.xz linux-dev-80c0e4f3a3a43664b38477fa5d9e6b6149b34d80.zip | |
qlcnic: Allow single Tx/Rx queue for all adapters.
o Allow user to set sigle Tx/Rx queue in MSI-x mode,
for ALL supported adapters.
Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com>
Signed-off-by: Manish Chopra <manish.chopra@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index 45b1da15ce47..72a1c12decde 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c @@ -646,8 +646,7 @@ int qlcnic_enable_msix(struct qlcnic_adapter *adapter, u32 num_msix) } else { adapter->ahw->num_msix = num_msix; if (qlcnic_check_multi_tx(adapter) && - !adapter->ahw->diag_test && - (adapter->drv_tx_rings > 1)) + !adapter->ahw->diag_test) drv_sds_rings = num_msix - drv_tx_rings; else drv_sds_rings = num_msix; @@ -3722,12 +3721,6 @@ int qlcnic_validate_rings(struct qlcnic_adapter *adapter, __u32 ring_cnt, return -EINVAL; } - if (ring_cnt < 2) { - netdev_err(netdev, - "%s rings value should not be lower than 2\n", buf); - return -EINVAL; - } - if (!is_power_of_2(ring_cnt)) { netdev_err(netdev, "%s rings value should be a power of 2\n", buf); |