projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'torvalds/master' into perf/core
[linux-2.6-microblaze.git]
/
net
/
ethtool
/
ioctl.c
diff --git
a/net/ethtool/ioctl.c
b/net/ethtool/ioctl.c
index
3fa7a39
..
baa5d10
100644
(file)
--- a/
net/ethtool/ioctl.c
+++ b/
net/ethtool/ioctl.c
@@
-1421,7
+1421,7
@@
static int ethtool_get_any_eeprom(struct net_device *dev, void __user *useraddr,
if (eeprom.offset + eeprom.len > total_len)
return -EINVAL;
if (eeprom.offset + eeprom.len > total_len)
return -EINVAL;
- data = k
m
alloc(PAGE_SIZE, GFP_USER);
+ data = k
z
alloc(PAGE_SIZE, GFP_USER);
if (!data)
return -ENOMEM;
if (!data)
return -ENOMEM;
@@
-1486,7
+1486,7
@@
static int ethtool_set_eeprom(struct net_device *dev, void __user *useraddr)
if (eeprom.offset + eeprom.len > ops->get_eeprom_len(dev))
return -EINVAL;
if (eeprom.offset + eeprom.len > ops->get_eeprom_len(dev))
return -EINVAL;
- data = k
m
alloc(PAGE_SIZE, GFP_USER);
+ data = k
z
alloc(PAGE_SIZE, GFP_USER);
if (!data)
return -ENOMEM;
if (!data)
return -ENOMEM;
@@
-1765,7
+1765,7
@@
static int ethtool_self_test(struct net_device *dev, char __user *useraddr)
return -EFAULT;
test.len = test_len;
return -EFAULT;
test.len = test_len;
- data = k
malloc_array
(test_len, sizeof(u64), GFP_USER);
+ data = k
calloc
(test_len, sizeof(u64), GFP_USER);
if (!data)
return -ENOMEM;
if (!data)
return -ENOMEM;
@@
-2293,7
+2293,7
@@
static int ethtool_get_tunable(struct net_device *dev, void __user *useraddr)
ret = ethtool_tunable_valid(&tuna);
if (ret)
return ret;
ret = ethtool_tunable_valid(&tuna);
if (ret)
return ret;
- data = k
m
alloc(tuna.len, GFP_USER);
+ data = k
z
alloc(tuna.len, GFP_USER);
if (!data)
return -ENOMEM;
ret = ops->get_tunable(dev, &tuna, data);
if (!data)
return -ENOMEM;
ret = ops->get_tunable(dev, &tuna, data);
@@
-2485,7
+2485,7
@@
static int get_phy_tunable(struct net_device *dev, void __user *useraddr)
ret = ethtool_phy_tunable_valid(&tuna);
if (ret)
return ret;
ret = ethtool_phy_tunable_valid(&tuna);
if (ret)
return ret;
- data = k
m
alloc(tuna.len, GFP_USER);
+ data = k
z
alloc(tuna.len, GFP_USER);
if (!data)
return -ENOMEM;
if (phy_drv_tunable) {
if (!data)
return -ENOMEM;
if (phy_drv_tunable) {