summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2005-11-07 09:58:07 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 16:53:25 +0100
commitbb531fc071f9017b4809c806f71e6a7f49b67289 (patch)
tree7ea3624e9dc8235eb47cec781c8117367eaeb9f6 /drivers
parent[PATCH] 3c59x: fix some grammar in module parameter descriptions (diff)
downloadlinux-bb531fc071f9017b4809c806f71e6a7f49b67289.tar.xz
linux-bb531fc071f9017b4809c806f71e6a7f49b67289.zip
[PATCH] 3c59x: support ETHTOOL_GPERMADDR
Add support for ETHTOOL_GPERMADDR to 3c59x. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/3c59x.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 7dcc5545557b..be4f962d27b0 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -1341,6 +1341,7 @@ static int __devinit vortex_probe1(struct device *gendev,
printk(" ***INVALID CHECKSUM %4.4x*** ", checksum);
for (i = 0; i < 3; i++)
((u16 *)dev->dev_addr)[i] = htons(eeprom[i + 10]);
+ memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
if (print_info) {
for (i = 0; i < 6; i++)
printk("%c%2.2x", i ? ':' : ' ', dev->dev_addr[i]);
@@ -3059,6 +3060,7 @@ static struct ethtool_ops vortex_ethtool_ops = {
.set_settings = vortex_set_settings,
.get_link = vortex_get_link,
.nway_reset = vortex_nway_reset,
+ .get_perm_addr = ethtool_op_get_perm_addr,
};
#ifdef CONFIG_PCI