summaryrefslogtreecommitdiffstats
path: root/drivers/net/forcedeth.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2005-09-12 10:48:56 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-09-14 08:29:32 -0400
commitc704b8566b060695e90ac401833db4b62813ad8a (patch)
treeb9f9c947689f21b4de558e6ef00a1ddf24841a6b /drivers/net/forcedeth.c
parenta92dd9233ad185904daf95d040cf88c3da2d7ef6 (diff)
downloadop-kernel-dev-c704b8566b060695e90ac401833db4b62813ad8a.zip
op-kernel-dev-c704b8566b060695e90ac401833db4b62813ad8a.tar.gz
[PATCH] forcedeth: support ETHTOOL_GPERMADDR
Add support for ETHTOOL_GPERMADDR to forcedeth. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net/forcedeth.c')
-rw-r--r--drivers/net/forcedeth.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index d6eefdb..6e042ec 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -2065,6 +2065,7 @@ static struct ethtool_ops ops = {
.get_regs_len = nv_get_regs_len,
.get_regs = nv_get_regs,
.nway_reset = nv_nway_reset,
+ .get_perm_addr = ethtool_op_get_perm_addr,
};
static int nv_open(struct net_device *dev)
@@ -2377,8 +2378,9 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
dev->dev_addr[3] = (np->orig_mac[0] >> 16) & 0xff;
dev->dev_addr[4] = (np->orig_mac[0] >> 8) & 0xff;
dev->dev_addr[5] = (np->orig_mac[0] >> 0) & 0xff;
+ memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
- if (!is_valid_ether_addr(dev->dev_addr)) {
+ if (!is_valid_ether_addr(dev->perm_addr)) {
/*
* Bad mac address. At least one bios sets the mac address
* to 01:23:45:67:89:ab
OpenPOWER on IntegriCloud