From e61aae923f5bef6bf5af8fe49cb4f07ba86ca468 Mon Sep 17 00:00:00 2001 From: "John W. Linville" Date: Mon, 12 Sep 2005 10:48:58 -0400 Subject: [PATCH] --- yaml --- r: 10208 b: refs/heads/master c: 30d60a8288ab6f59939736f5775a7110a8bfff9a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/sundance.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3a49601111d2..6968d0641bd1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 56230d538233ba037eb679b0fc0b218d33b9b8b8 +refs/heads/master: 30d60a8288ab6f59939736f5775a7110a8bfff9a diff --git a/trunk/drivers/net/sundance.c b/trunk/drivers/net/sundance.c index d500a5771dbc..e148a7212073 100644 --- a/trunk/drivers/net/sundance.c +++ b/trunk/drivers/net/sundance.c @@ -549,6 +549,7 @@ static int __devinit sundance_probe1 (struct pci_dev *pdev, for (i = 0; i < 3; i++) ((u16 *)dev->dev_addr)[i] = le16_to_cpu(eeprom_read(ioaddr, i + EEPROM_SA_OFFSET)); + memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); dev->base_addr = (unsigned long)ioaddr; dev->irq = irq; @@ -1619,6 +1620,7 @@ static struct ethtool_ops ethtool_ops = { .get_link = get_link, .get_msglevel = get_msglevel, .set_msglevel = set_msglevel, + .get_perm_addr = ethtool_op_get_perm_addr, }; static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)