aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c')
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c11
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;