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

Commit c99c2872 authored by Intiyaz Basha's avatar Intiyaz Basha Committed by David S. Miller
Browse files

liquidio: fix wrong info about vf rx/tx ring parameters reported to ethtool 



Information reported to ethtool about vf rx/tx ring parameters is wrong.
Fix it by adding the missing initializations.

Signed-off-by: default avatarIntiyaz Basha <intiyaz.basha@cavium.com>
Signed-off-by: default avatarFelix Manlunas <felix.manlunas@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent db53dce9

drivers/net/ethernet/cavium/liquidio/lio_ethtool.c

+9 −21
Original line number Diff line number Diff line
@@ -649,23 +649,15 @@ lio_ethtool_get_ringparam(struct net_device *netdev, 
		rx_max_pending = CN6XXX_MAX_OQ_DESCRIPTORS;

		rx_pending = CFG_GET_NUM_RX_DESCS_NIC_IF(conf6x, lio->ifidx);

		tx_pending = CFG_GET_NUM_TX_DESCS_NIC_IF(conf6x, lio->ifidx);

	} else if (OCTEON_CN23XX_PF(oct)) {

		struct octeon_config *conf23 = CHIP_CONF(oct, cn23xx_pf);



	} else if (OCTEON_CN23XX_PF(oct) || OCTEON_CN23XX_VF(oct)) {

		tx_max_pending = CN23XX_MAX_IQ_DESCRIPTORS;

		rx_max_pending = CN23XX_MAX_OQ_DESCRIPTORS;

		rx_pending = CFG_GET_NUM_RX_DESCS_NIC_IF(conf23, lio->ifidx);

		tx_pending = CFG_GET_NUM_TX_DESCS_NIC_IF(conf23, lio->ifidx);

		rx_pending = oct->droq[0]->max_count;

		tx_pending = oct->instr_queue[0]->max_count;

	}



	if (lio->mtu > OCTNET_DEFAULT_FRM_SIZE - OCTNET_FRM_HEADER_SIZE) {

		ering->rx_pending = 0;

		ering->rx_max_pending = 0;

		ering->rx_mini_pending = 0;

		ering->rx_jumbo_pending = rx_pending;

		ering->rx_mini_max_pending = 0;

		ering->rx_jumbo_max_pending = rx_max_pending;

	} else {

	ering->tx_pending = tx_pending;

	ering->tx_max_pending = tx_max_pending;

	ering->rx_pending = rx_pending;

	ering->rx_max_pending = rx_max_pending;

	ering->rx_mini_pending = 0;
@@ -674,10 +666,6 @@ lio_ethtool_get_ringparam(struct net_device *netdev, 
	ering->rx_jumbo_max_pending = 0;

}



	ering->tx_pending = tx_pending;

	ering->tx_max_pending = tx_max_pending;

}



static u32 lio_get_msglevel(struct net_device *netdev)

{

	struct lio *lio = GET_LIO(netdev);