aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@evo.osdl.org>2005-09-06 00:47:18 -0700
committerLinus Torvalds <torvalds@evo.osdl.org>2005-09-06 00:47:18 -0700
commit5bcaa155797ab62ed363932ec0f02fbcb5db1ef1 (patch)
tree1db633712bd47ce72ac5a1aed62b3417733ac63a /net
parent1e231efe50ffe4d291be24d2fe393188de9c4b08 (diff)
parent3a48c4c2d52a08e12319ab7caacad0a9b88e6cb4 (diff)
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'net')
-rw-r--r--net/core/ethtool.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 289c1b5a8e4..404b761e82c 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -695,7 +695,7 @@ static int ethtool_get_stats(struct net_device *dev, void __user *useraddr)
return ret;
}
-static int ethtool_get_perm_addr(struct net_device *dev, void *useraddr)
+static int ethtool_get_perm_addr(struct net_device *dev, void __user *useraddr)
{
struct ethtool_perm_addr epaddr;
u8 *data;