X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=net%2Fcore%2Fethtool.c;h=8d5e5a09b5760003466518030aa3822a493b80ae;hb=e71a4783aae059931f63b2d4e7013e36529badef;hp=87dc556fd9d6c694f65e33c6868aebdeef8325cc;hpb=946b92437e550d6ed80213bf54a1f383e141aede;p=powerpc.git diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 87dc556fd9..8d5e5a09b5 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -17,7 +17,7 @@ #include #include -/* +/* * Some useful ethtool_ops methods that're device independent. * If we find that all drivers want to do the same thing here, * we can turn these into dev_() function calls. @@ -87,12 +87,12 @@ int ethtool_op_get_perm_addr(struct net_device *dev, struct ethtool_perm_addr *a unsigned char len = dev->addr_len; if ( addr->size < len ) return -ETOOSMALL; - + addr->size = len; memcpy(data, dev->perm_addr, len); return 0; } - + u32 ethtool_op_get_ufo(struct net_device *dev) { @@ -550,7 +550,7 @@ static int ethtool_set_sg(struct net_device *dev, char __user *useraddr) if (copy_from_user(&edata, useraddr, sizeof(edata))) return -EFAULT; - if (edata.data && + if (edata.data && !(dev->features & NETIF_F_ALL_CSUM)) return -EINVAL; @@ -836,7 +836,7 @@ int dev_ethtool(struct ifreq *ifr) return -EPERM; } - if(dev->ethtool_ops->begin) + if (dev->ethtool_ops->begin) if ((rc = dev->ethtool_ops->begin(dev)) < 0) return rc; @@ -951,8 +951,8 @@ int dev_ethtool(struct ifreq *ifr) default: rc = -EOPNOTSUPP; } - - if(dev->ethtool_ops->complete) + + if (dev->ethtool_ops->complete) dev->ethtool_ops->complete(dev); if (old_features != dev->features)