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

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

qlcnic: Fix TSS/RSS ring validation logic. 



o TSS/RSS ring validation does not take into account that either
  of these ring values can be 0. This patch fixes this validation
  and would fail set_channel operation if any of these ring value
  is 0. This regression was added as part of commit id
  34e8c406 ("qlcnic: refactor Tx/SDS
  ring calculation and validation in driver.")

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

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

+2 −2
Original line number Diff line number Diff line
@@ -2073,8 +2073,8 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter) 
		ahw->nic_mode = QLCNIC_DEFAULT_MODE;

		adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;

		ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;

		adapter->max_sds_rings = ahw->max_rx_ques;

		adapter->max_tx_rings = ahw->max_tx_ques;

		adapter->max_sds_rings = QLCNIC_MAX_SDS_RINGS;

		adapter->max_tx_rings = QLCNIC_MAX_TX_RINGS;

	} else {

		return -EIO;

	}

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

+5 −1
Original line number Diff line number Diff line
@@ -667,9 +667,13 @@ qlcnic_set_ringparam(struct net_device *dev, 
static int qlcnic_validate_ring_count(struct qlcnic_adapter *adapter,

				      u8 rx_ring, u8 tx_ring)

{

	if (rx_ring == 0 || tx_ring == 0)

		return -EINVAL;



	if (rx_ring != 0) {

		if (rx_ring > adapter->max_sds_rings) {

			netdev_err(adapter->netdev, "Invalid ring count, SDS ring count %d should not be greater than max %d driver sds rings.\n",

			netdev_err(adapter->netdev,

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

				   rx_ring, adapter->max_sds_rings);

			return -EINVAL;

		}

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

+1 −0
Original line number Diff line number Diff line
@@ -1178,6 +1178,7 @@ qlcnic_initialize_nic(struct qlcnic_adapter *adapter) 
	} else {

		adapter->ahw->nic_mode = QLCNIC_DEFAULT_MODE;

		adapter->max_tx_rings = QLCNIC_MAX_HW_TX_RINGS;

		adapter->max_sds_rings = QLCNIC_MAX_SDS_RINGS;

		adapter->flags &= ~QLCNIC_ESWITCH_ENABLED;

	}