Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-28 07:01:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

ethtool: rename local variable max -> curr

Browse Source 
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: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
This commit is contained in:
Jakub Kicinski 2018-10-01 14:51:35 +02:00 committed by Daniel Borkmann
parent c9b47cc1fa
commit b8c8a2e2e3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/core/ethtool.c
View File

@ -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, static noinline_for_stack int ethtool_set_channels(struct net_device *dev,
void __user *useraddr) 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; u32 max_rx_in_use = 0;
if (!dev->ethtool_ops->set_channels || !dev->ethtool_ops->get_channels) 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))) if (copy_from_user(&channels, useraddr, sizeof(channels)))
return -EFAULT; return -EFAULT;
dev->ethtool_ops->get_channels(dev, &max); dev->ethtool_ops->get_channels(dev, &curr);
/* ensure new counts are within the maximums */ /* ensure new counts are within the maximums */
if ((channels.rx_count > max.max_rx) || if (channels.rx_count > curr.max_rx ||
(channels.tx_count > max.max_tx) || channels.tx_count > curr.max_tx ||
(channels.combined_count > max.max_combined) || channels.combined_count > curr.max_combined ||
(channels.other_count > max.max_other)) channels.other_count > curr.max_other)
return -EINVAL; return -EINVAL;
/* ensure the new Rx count fits within the configured Rx flow /* ensure the new Rx count fits within the configured Rx flow