diff options
| author | John W. Linville <linville@tuxdriver.com> | 2005-09-12 16:48:56 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 14:29:32 +0200 |
| commit | c704b8566b060695e90ac401833db4b62813ad8a (patch) | |
| tree | b9f9c947689f21b4de558e6ef00a1ddf24841a6b /drivers/net | |
| parent | [PATCH] e100: support ETHTOOL_GPERMADDR (diff) | |
| download | linux-c704b8566b060695e90ac401833db4b62813ad8a.tar.xz linux-c704b8566b060695e90ac401833db4b62813ad8a.zip | |
[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')
| -rw-r--r-- | drivers/net/forcedeth.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index d6eefdb71c17..6e042ecf6965 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 |