diff options
| author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2010-11-30 06:38:00 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-06 12:59:04 -0800 |
| commit | 7903264402546f45f9bac8ad2bfdb00d00eb124a (patch) | |
| tree | 32076a169b37ce9c98916ed2d702de5cab1aeb6c /net/core/ethtool.c | |
| parent | 900d495a189dc3ff5952b98a77d18e3018f8286c (diff) | |
| download | kernel_samsung_smdk4412-7903264402546f45f9bac8ad2bfdb00d00eb124a.zip kernel_samsung_smdk4412-7903264402546f45f9bac8ad2bfdb00d00eb124a.tar.gz kernel_samsung_smdk4412-7903264402546f45f9bac8ad2bfdb00d00eb124a.tar.bz2 | |
net: Fix too optimistic NETIF_F_HW_CSUM features
NETIF_F_HW_CSUM is a superset of NETIF_F_IP_CSUM+NETIF_F_IPV6_CSUM, but
some drivers miss the difference. Fix this and also fix UFO dependency
on checksumming offload as it makes the same mistake in assumptions.
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Acked-by: Jon Mason <jon.mason@exar.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/ethtool.c')
| -rw-r--r-- | net/core/ethtool.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 956a9f4..d5bc2881 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -1171,7 +1171,9 @@ static int ethtool_set_ufo(struct net_device *dev, char __user *useraddr) return -EFAULT; if (edata.data && !(dev->features & NETIF_F_SG)) return -EINVAL; - if (edata.data && !(dev->features & NETIF_F_HW_CSUM)) + if (edata.data && !((dev->features & NETIF_F_GEN_CSUM) || + (dev->features & (NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM)) + == (NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM))) return -EINVAL; return dev->ethtool_ops->set_ufo(dev, edata.data); } |