From f98ae060cd1852e1a6ab3676881daec5a853c980 Mon Sep 17 00:00:00 2001 From: "John W. Linville" Date: Mon, 12 Sep 2005 10:48:58 -0400 Subject: [PATCH] --- yaml --- r: 10209 b: refs/heads/master c: b81e8e1f4a51556586f72711a165bc3a0de230f3 h: refs/heads/master i: 10207: 7053d75db26f4d4554d34910236ec87b22690467 v: v3 --- [refs] | 2 +- trunk/drivers/net/via-rhine.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6968d0641bd1..580bb9dc699b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30d60a8288ab6f59939736f5775a7110a8bfff9a +refs/heads/master: b81e8e1f4a51556586f72711a165bc3a0de230f3 diff --git a/trunk/drivers/net/via-rhine.c b/trunk/drivers/net/via-rhine.c index fc7738ffbfff..e7b4bc3820e3 100644 --- a/trunk/drivers/net/via-rhine.c +++ b/trunk/drivers/net/via-rhine.c @@ -814,8 +814,9 @@ static int __devinit rhine_init_one(struct pci_dev *pdev, for (i = 0; i < 6; i++) dev->dev_addr[i] = ioread8(ioaddr + StationAddr + i); + 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)) { rc = -EIO; printk(KERN_ERR "Invalid MAC address\n"); goto err_out_unmap; @@ -1829,6 +1830,7 @@ static struct ethtool_ops netdev_ethtool_ops = { .set_wol = rhine_set_wol, .get_sg = ethtool_op_get_sg, .get_tx_csum = ethtool_op_get_tx_csum, + .get_perm_addr = ethtool_op_get_perm_addr, }; static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)