diff options
author | John W. Linville <linville@tuxdriver.com> | 2005-09-12 10:48:58 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:30:02 -0400 |
commit | b81e8e1f4a51556586f72711a165bc3a0de230f3 (patch) | |
tree | f57c521eb64c3124637b593932317ab1574518b9 /drivers | |
parent | 30d60a8288ab6f59939736f5775a7110a8bfff9a (diff) | |
download | linux-stable-b81e8e1f4a51556586f72711a165bc3a0de230f3.tar.gz linux-stable-b81e8e1f4a51556586f72711a165bc3a0de230f3.tar.bz2 linux-stable-b81e8e1f4a51556586f72711a165bc3a0de230f3.zip |
[PATCH] via-rhine: support ETHTOOL_GPERMADDR
Add support for ETHTOOL_GPERMADDR to via-rhine.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/via-rhine.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c index fc7738ffbfff..e7b4bc3820e3 100644 --- a/drivers/net/via-rhine.c +++ b/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) |