From: Jakub Kicinski Date: Fri, 15 May 2020 19:49:02 +0000 (-0700) Subject: ethtool: don't call set_channels in drivers if config didn't change X-Git-Tag: v5.8-rc1~165^2~169^2 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=75c36dbb1c3790eab909344b758decce6bb432da;p=linux-2.6-block.git ethtool: don't call set_channels in drivers if config didn't change Don't call drivers if nothing changed. Netlink code already contains this logic. Signed-off-by: Jakub Kicinski Reviewed-by: Michal Kubecek Signed-off-by: David S. Miller --- diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c index a574d60111fa..eeb1137a3f23 100644 --- a/net/ethtool/ioctl.c +++ b/net/ethtool/ioctl.c @@ -1669,6 +1669,12 @@ static noinline_for_stack int ethtool_set_channels(struct net_device *dev, dev->ethtool_ops->get_channels(dev, &curr); + if (channels.rx_count == curr.rx_count && + channels.tx_count == curr.tx_count && + channels.combined_count == curr.combined_count && + channels.other_count == curr.other_count) + return 0; + /* ensure new counts are within the maximums */ if (channels.rx_count > curr.max_rx || channels.tx_count > curr.max_tx ||