Commit b8c8a2e2 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Daniel Borkmann
Browse files

ethtool: rename local variable max -> curr 



ethtool_set_channels() validates the config against driver's max
settings. It retrieves the current config and stores it in a
variable called max. This was okay when only max settings were
accessed but we will soon want to access current settings as
well, so calling the entire structure max makes the code less
readable.

While at it drop unnecessary parenthesis.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarQuentin Monnet <quentin.monnet@netronome.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent c9b47cc1

net/core/ethtool.c

+6 −6
Original line number Diff line number Diff line
@@ -1655,7 +1655,7 @@ static noinline_for_stack int ethtool_get_channels(struct net_device *dev, 
static noinline_for_stack int ethtool_set_channels(struct net_device *dev,

						   void __user *useraddr)

{

	struct ethtool_channels channels, max = { .cmd = ETHTOOL_GCHANNELS };

	struct ethtool_channels channels, curr = { .cmd = ETHTOOL_GCHANNELS };

	u32 max_rx_in_use = 0;



	if (!dev->ethtool_ops->set_channels || !dev->ethtool_ops->get_channels)
@@ -1664,13 +1664,13 @@ static noinline_for_stack int ethtool_set_channels(struct net_device *dev, 
	if (copy_from_user(&channels, useraddr, sizeof(channels)))

		return -EFAULT;



	dev->ethtool_ops->get_channels(dev, &max);

	dev->ethtool_ops->get_channels(dev, &curr);



	/* ensure new counts are within the maximums */

	if ((channels.rx_count > max.max_rx) ||

	    (channels.tx_count > max.max_tx) ||

	    (channels.combined_count > max.max_combined) ||

	    (channels.other_count > max.max_other))

	if (channels.rx_count > curr.max_rx ||

	    channels.tx_count > curr.max_tx ||

	    channels.combined_count > curr.max_combined ||

	    channels.other_count > curr.max_other)

		return -EINVAL;



	/* ensure the new Rx count fits within the configured Rx flow

CRA Git | Maintained and supported by SUSTech CRA and CCSE