diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 03:47:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 03:47:18 -0400 |
| commit | 5bcaa155797ab62ed363932ec0f02fbcb5db1ef1 (patch) | |
| tree | 1db633712bd47ce72ac5a1aed62b3417733ac63a /net | |
| parent | 1e231efe50ffe4d291be24d2fe393188de9c4b08 (diff) | |
| parent | 3a48c4c2d52a08e12319ab7caacad0a9b88e6cb4 (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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 289c1b5a8e4a..404b761e82ce 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) | |||
| 695 | return ret; | 695 | return ret; |
| 696 | } | 696 | } |
| 697 | 697 | ||
| 698 | static int ethtool_get_perm_addr(struct net_device *dev, void *useraddr) | 698 | static int ethtool_get_perm_addr(struct net_device *dev, void __user *useraddr) |
| 699 | { | 699 | { |
| 700 | struct ethtool_perm_addr epaddr; | 700 | struct ethtool_perm_addr epaddr; |
| 701 | u8 *data; | 701 | u8 *data; |