Commit 67c96608 authored Sep 17, 2010 by Eric Dumazet Committed by David S. Miller Sep 17, 2010

ethtool: change ethtool_set_gro() to use ethtool_op_get_rx_csum



To be able to switch on GRO on a device, ethtool_set_gro() checks this
device provides a get_rx_csum() method.

Some devices dont provide this method, while they do support RX
checksumming.

This patch allows bonding to support GRO :

ethtool -K bond0 gro on

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 457e9d22

net/core/ethtool.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -1181,8 +1181,11 @@ static int ethtool_set_gro(struct net_device dev, char __user useraddr)
		return -EFAULT;

		if (edata.data) {
		if (!dev->ethtool_ops->get_rx_csum \|\|
		!dev->ethtool_ops->get_rx_csum(dev))
		u32 rxcsum = dev->ethtool_ops->get_rx_csum ?
		dev->ethtool_ops->get_rx_csum(dev) :
		ethtool_op_get_rx_csum(dev);

		if (!rxcsum)
		return -EINVAL;
		dev->features \|= NETIF_F_GRO;
		} else