diff options
author | viro@ftp.linux.org.uk <viro@ftp.linux.org.uk> | 2005-09-05 20:36:58 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-06 22:17:12 -0400 |
commit | 25097d4bda4a554d8b4a9989c7d8bcb67ef53f48 (patch) | |
tree | 713b67b22903c05dfbcd565fa954c5e18e532d1f /drivers/net | |
parent | 269cd3819cf1cc20f9567c4920b59c15751076d3 (diff) |
[PATCH] __user annotations (forcedeth.c)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/forcedeth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 7d93948aec83..d6eefdb71c17 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c | |||
@@ -1372,7 +1372,7 @@ static int nv_change_mtu(struct net_device *dev, int new_mtu) | |||
1372 | 1372 | ||
1373 | /* synchronized against open : rtnl_lock() held by caller */ | 1373 | /* synchronized against open : rtnl_lock() held by caller */ |
1374 | if (netif_running(dev)) { | 1374 | if (netif_running(dev)) { |
1375 | u8 *base = get_hwbase(dev); | 1375 | u8 __iomem *base = get_hwbase(dev); |
1376 | /* | 1376 | /* |
1377 | * It seems that the nic preloads valid ring entries into an | 1377 | * It seems that the nic preloads valid ring entries into an |
1378 | * internal buffer. The procedure for flushing everything is | 1378 | * internal buffer. The procedure for flushing everything is |
@@ -1423,7 +1423,7 @@ static int nv_change_mtu(struct net_device *dev, int new_mtu) | |||
1423 | 1423 | ||
1424 | static void nv_copy_mac_to_hw(struct net_device *dev) | 1424 | static void nv_copy_mac_to_hw(struct net_device *dev) |
1425 | { | 1425 | { |
1426 | u8 *base = get_hwbase(dev); | 1426 | u8 __iomem *base = get_hwbase(dev); |
1427 | u32 mac[2]; | 1427 | u32 mac[2]; |
1428 | 1428 | ||
1429 | mac[0] = (dev->dev_addr[0] << 0) + (dev->dev_addr[1] << 8) + | 1429 | mac[0] = (dev->dev_addr[0] << 0) + (dev->dev_addr[1] << 8) + |