qlcnic: Optimize ring count validations

- Check interrupt mode at the start of qlcnic_set_channels().
- Do not validate ring count if they are not going to change.

Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
index 5bacf5210aed658abc12c639be38f0649bf96cbf..1b7f3dbae2899d9ade666176a7cfdb0e21a82d6f 100644 (file)
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
@@ -726,6 +726,11 @@ static int qlcnic_set_channels(struct net_device *dev,
        struct qlcnic_adapter *adapter = netdev_priv(dev);
        int err;
 
+       if (!(adapter->flags & QLCNIC_MSIX_ENABLED)) {
+               netdev_err(dev, "No RSS/TSS support in non MSI-X mode\n");
+               return -EINVAL;
+       }
+
        if (channel->other_count || channel->combined_count)
                return -EINVAL;
 
@@ -734,7 +739,7 @@ static int qlcnic_set_channels(struct net_device *dev,
        if (err)
                return err;
 
-       if (channel->rx_count) {
+       if (adapter->drv_sds_rings != channel->rx_count) {
                err = qlcnic_validate_rings(adapter, channel->rx_count,
                                            QLCNIC_RX_QUEUE);
                if (err) {
@@ -745,7 +750,7 @@ static int qlcnic_set_channels(struct net_device *dev,
                adapter->drv_rss_rings = channel->rx_count;
        }
 
-       if (channel->tx_count) {
+       if (adapter->drv_tx_rings != channel->tx_count) {
                err = qlcnic_validate_rings(adapter, channel->tx_count,
                                            QLCNIC_TX_QUEUE);
                if (err) {

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 1c188919cdda2bc6b05fa340707dedd1db966ed9..4fc186713b660c8d823744f842cf3551dd660092 100644 (file)
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -4003,16 +4003,6 @@ int qlcnic_validate_rings(struct qlcnic_adapter *adapter, __u32 ring_cnt,
                strcpy(buf, "Tx");
        }
 
-       if (!QLCNIC_IS_MSI_FAMILY(adapter)) {
-               netdev_err(netdev, "No RSS/TSS support in INT-x mode\n");
-               return -EINVAL;
-       }
-
-       if (adapter->flags & QLCNIC_MSI_ENABLED) {
-               netdev_err(netdev, "No RSS/TSS support in MSI mode\n");
-               return -EINVAL;
-       }
-
        if (!is_power_of_2(ring_cnt)) {
                netdev_err(netdev, "%s rings value should be a power of 2\n",
                           buf);