diff options
| author | John W. Linville <linville@tuxdriver.com> | 2005-09-12 16:48:54 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 14:29:31 +0200 |
| commit | bb0ce608a3386268bd76ee6642a4cc8e6818a29b (patch) | |
| tree | 00648bee47898e3ef84448b6e6e30feba1fec2c6 /drivers/net/8139cp.c | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-bb0ce608a3386268bd76ee6642a4cc8e6818a29b.tar.xz linux-bb0ce608a3386268bd76ee6642a4cc8e6818a29b.zip | |
[PATCH] 8139cp: support ETHTOOL_GPERMADDR
Add support for ETHTOOL_GPERMADDR to 8139cp.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net/8139cp.c')
| -rw-r--r-- | drivers/net/8139cp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c index 34b80de34fae..ebc20d9e7d7b 100644 --- a/drivers/net/8139cp.c +++ b/drivers/net/8139cp.c @@ -1575,6 +1575,7 @@ static struct ethtool_ops cp_ethtool_ops = { .set_wol = cp_set_wol, .get_strings = cp_get_strings, .get_ethtool_stats = cp_get_ethtool_stats, + .get_perm_addr = ethtool_op_get_perm_addr, }; static int cp_ioctl (struct net_device *dev, struct ifreq *rq, int cmd) @@ -1773,6 +1774,7 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) for (i = 0; i < 3; i++) ((u16 *) (dev->dev_addr))[i] = le16_to_cpu (read_eeprom (regs, i + 7, addr_len)); + memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); dev->open = cp_open; dev->stop = cp_close; |