qlcnic: Validate Tx queue only for 82xx adapters.

o validate Tx queue only in case of adapters which supports
  multi Tx queue.

  This patch is to fix regression introduced in commit
  aa4a1f7df7cbb98797c9f4edfde3c726e2b3841f
  "qlcnic: Enable Tx queue changes using ethtool for 82xx Series adapter"

Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 2 insertions, 8 deletions

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
index ebe4c86e5230..ff83a9fcd4c5 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
@@ -665,7 +665,7 @@ static int qlcnic_set_channels(struct net_device *dev,
                         return err;
         }
 
-        if (channel->tx_count) {
+        if (qlcnic_82xx_check(adapter) && channel->tx_count) {
                 err = qlcnic_validate_max_tx_rings(adapter, channel->tx_count);
                 if (err)
                         return err;
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index f07f2b0fefa0..9e61eb867452 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -3651,11 +3651,6 @@ int qlcnic_validate_max_tx_rings(struct qlcnic_adapter *adapter, u32 txq)
         u8 max_hw = QLCNIC_MAX_TX_RINGS;
         u32 max_allowed;
 
-        if (!qlcnic_82xx_check(adapter)) {
-                netdev_err(netdev, "No Multi TX-Q support\n");
-                return -EINVAL;
-        }
-
         if (!qlcnic_use_msi_x && !qlcnic_use_msi) {
                 netdev_err(netdev, "No Multi TX-Q support in INT-x mode\n");
                 return -EINVAL;
@@ -3695,8 +3690,7 @@ int qlcnic_validate_max_rss(struct qlcnic_adapter *adapter,
         u8 max_hw = adapter->ahw->max_rx_ques;
         u32 max_allowed;
 
-        if (qlcnic_82xx_check(adapter) && !qlcnic_use_msi_x &&
-            !qlcnic_use_msi) {
+        if (!qlcnic_use_msi_x && !qlcnic_use_msi) {
                 netdev_err(netdev, "No RSS support in INT-x mode\n");
                 return -EINVAL;
         }