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

Commit b17a44d8 authored by Himanshu Madhani's avatar Himanshu Madhani Committed by David S. Miller
Browse files

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
  18afc102 ("qlcnic: Enable
  multiple Tx queue support for 83xx/84xx Series adapter.")

Signed-off-by: default avatarHimanshu Madhani <himanshu.madhani@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f9566265

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

+1 −10
Original line number Diff line number Diff line
@@ -680,21 +680,12 @@ static int qlcnic_validate_ring_count(struct qlcnic_adapter *adapter, 
	}



	 if (tx_ring != 0) {

		if (qlcnic_82xx_check(adapter) &&

		    (tx_ring > adapter->max_tx_rings)) {

		if (tx_ring > adapter->max_tx_rings) {

			netdev_err(adapter->netdev,

				   "Invalid ring count, Tx ring count %d should not be greater than max %d driver Tx rings.\n",

				   tx_ring, adapter->max_tx_rings);

			return -EINVAL;

		}



		if (qlcnic_83xx_check(adapter) &&

		    (tx_ring > QLCNIC_SINGLE_RING)) {

			netdev_err(adapter->netdev,

				   "Invalid ring count, Tx ring count %d should not be greater than %d driver Tx rings.\n",

				   tx_ring, QLCNIC_SINGLE_RING);

			 return -EINVAL;

		}

	}



	return 0;