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

Commit 76e583c5 authored by Antoine Tenart's avatar Antoine Tenart Committed by David S. Miller
Browse files

net: mvpp2: check ethtool sets the Tx ring size is to a valid min value 



This patch fixes the Tx ring size checks when using ethtool, by adding
an extra check in the PPv2 check_ringparam_valid helper. The Tx ring
size cannot be set to a value smaller than the minimum number of
descriptors needed for TSO.

Fixes: 1d17db08 ("net: mvpp2: limit TSO segments and use stop/wake thresholds")
Suggested-by: default avatarYan Markman <ymarkman@marvell.com>
Signed-off-by: default avatarAntoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e749aca8

drivers/net/ethernet/marvell/mvpp2.c

+6 −0
Original line number Diff line number Diff line
@@ -6842,6 +6842,12 @@ static int mvpp2_check_ringparam_valid(struct net_device *dev, 
	else if (!IS_ALIGNED(ring->tx_pending, 32))

		new_tx_pending = ALIGN(ring->tx_pending, 32);



	/* The Tx ring size cannot be smaller than the minimum number of

	 * descriptors needed for TSO.

	 */

	if (new_tx_pending < MVPP2_MAX_SKB_DESCS)

		new_tx_pending = ALIGN(MVPP2_MAX_SKB_DESCS, 32);



	if (ring->rx_pending != new_rx_pending) {

		netdev_info(dev, "illegal Rx ring size value %d, round to %d\n",

			    ring->rx_pending, new_rx_pending);