diff options
Diffstat (limited to 'net/core/ethtool.c')
-rw-r--r-- | net/core/ethtool.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 87dc556fd9d6..6168edd137dd 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <linux/netdevice.h> | 17 | #include <linux/netdevice.h> |
18 | #include <asm/uaccess.h> | 18 | #include <asm/uaccess.h> |
19 | 19 | ||
20 | /* | 20 | /* |
21 | * Some useful ethtool_ops methods that're device independent. | 21 | * Some useful ethtool_ops methods that're device independent. |
22 | * If we find that all drivers want to do the same thing here, | 22 | * If we find that all drivers want to do the same thing here, |
23 | * we can turn these into dev_() function calls. | 23 | * 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 | |||
87 | unsigned char len = dev->addr_len; | 87 | unsigned char len = dev->addr_len; |
88 | if ( addr->size < len ) | 88 | if ( addr->size < len ) |
89 | return -ETOOSMALL; | 89 | return -ETOOSMALL; |
90 | 90 | ||
91 | addr->size = len; | 91 | addr->size = len; |
92 | memcpy(data, dev->perm_addr, len); | 92 | memcpy(data, dev->perm_addr, len); |
93 | return 0; | 93 | return 0; |
94 | } | 94 | } |
95 | 95 | ||
96 | 96 | ||
97 | u32 ethtool_op_get_ufo(struct net_device *dev) | 97 | u32 ethtool_op_get_ufo(struct net_device *dev) |
98 | { | 98 | { |
@@ -550,7 +550,7 @@ static int ethtool_set_sg(struct net_device *dev, char __user *useraddr) | |||
550 | if (copy_from_user(&edata, useraddr, sizeof(edata))) | 550 | if (copy_from_user(&edata, useraddr, sizeof(edata))) |
551 | return -EFAULT; | 551 | return -EFAULT; |
552 | 552 | ||
553 | if (edata.data && | 553 | if (edata.data && |
554 | !(dev->features & NETIF_F_ALL_CSUM)) | 554 | !(dev->features & NETIF_F_ALL_CSUM)) |
555 | return -EINVAL; | 555 | return -EINVAL; |
556 | 556 | ||
@@ -951,7 +951,7 @@ int dev_ethtool(struct ifreq *ifr) | |||
951 | default: | 951 | default: |
952 | rc = -EOPNOTSUPP; | 952 | rc = -EOPNOTSUPP; |
953 | } | 953 | } |
954 | 954 | ||
955 | if(dev->ethtool_ops->complete) | 955 | if(dev->ethtool_ops->complete) |
956 | dev->ethtool_ops->complete(dev); | 956 | dev->ethtool_ops->complete(dev); |
957 | 957 | ||