diff options
author | Himanshu Madhani <himanshu.madhani@qlogic.com> | 2013-12-16 15:36:59 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-12-17 16:24:50 -0500 |
commit | b17a44d8b86f48e34011b884a934231ae2928d66 (patch) | |
tree | a18fc2b9b4fea76739e17e7586bffa3992467978 /drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | |
parent | f9566265d7b44fea789072dcfa9a454e7e433af6 (diff) |
qlcnic: Fix TSS/RSS validation for 83xx/84xx series adapter.
o Current code was not allowing the user to configure more
than one Tx ring using ethtool for 83xx/84xx adapter.
This regression was introduced by commit id
18afc102fdcb95d6c7d57f2967a06f2f8fe3ba4c ("qlcnic: Enable
multiple Tx queue support for 83xx/84xx Series adapter.")
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_ethtool.c')
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c index 78f5e815139e..e3be2760665c 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | |||
@@ -680,21 +680,12 @@ static int qlcnic_validate_ring_count(struct qlcnic_adapter *adapter, | |||
680 | } | 680 | } |
681 | 681 | ||
682 | if (tx_ring != 0) { | 682 | if (tx_ring != 0) { |
683 | if (qlcnic_82xx_check(adapter) && | 683 | if (tx_ring > adapter->max_tx_rings) { |
684 | (tx_ring > adapter->max_tx_rings)) { | ||
685 | netdev_err(adapter->netdev, | 684 | netdev_err(adapter->netdev, |
686 | "Invalid ring count, Tx ring count %d should not be greater than max %d driver Tx rings.\n", | 685 | "Invalid ring count, Tx ring count %d should not be greater than max %d driver Tx rings.\n", |
687 | tx_ring, adapter->max_tx_rings); | 686 | tx_ring, adapter->max_tx_rings); |
688 | return -EINVAL; | 687 | return -EINVAL; |
689 | } | 688 | } |
690 | |||
691 | if (qlcnic_83xx_check(adapter) && | ||
692 | (tx_ring > QLCNIC_SINGLE_RING)) { | ||
693 | netdev_err(adapter->netdev, | ||
694 | "Invalid ring count, Tx ring count %d should not be greater than %d driver Tx rings.\n", | ||
695 | tx_ring, QLCNIC_SINGLE_RING); | ||
696 | return -EINVAL; | ||
697 | } | ||
698 | } | 689 | } |
699 | 690 | ||
700 | return 0; | 691 | return 0; |