Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18e0d625 authored by Shahed Shaikh's avatar Shahed Shaikh Committed by David S. Miller
Browse files

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: default avatarShahed Shaikh <shahed.shaikh@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4da005cf

drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c

+7 −2
Original line number Diff line number Diff line
@@ -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) {

drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c

+0 −10
Original line number Diff line number Diff line
@@ -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);