From 0493456c909f2a9d8606eef1161a00b8a6736466 Mon Sep 17 00:00:00 2001 From: "viro@ftp.linux.org.uk" Date: Mon, 5 Sep 2005 03:26:18 +0100 Subject: [PATCH] --- yaml --- r: 7267 b: refs/heads/master c: 0bf0519d2b531459009caab718b94fdf94d63d17 h: refs/heads/master i: 7265: 85cee5fb95e87ef65c5d067589260f688cb33c4d 7263: eae7114517a93a63440934c98bbcd44bf43a593e v: v3 --- [refs] | 2 +- trunk/net/core/ethtool.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ea1d13aeecc1..09545e6885f3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 843684a24eb7b261461d8bc1aa723c23732ecb94 +refs/heads/master: 0bf0519d2b531459009caab718b94fdf94d63d17 diff --git a/trunk/net/core/ethtool.c b/trunk/net/core/ethtool.c index 289c1b5a8e4a..404b761e82ce 100644 --- a/trunk/net/core/ethtool.c +++ b/trunk/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;