From 95a3a0617ba95962876bf0d04b069c8fff0694eb Mon Sep 17 00:00:00 2001 From: "John W. Linville" Date: Mon, 12 Sep 2005 10:48:55 -0400 Subject: [PATCH] --- yaml --- r: 10198 b: refs/heads/master c: 62a720b889a37496d5f36d09875578956745d196 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/8139too.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 201dd12b851f..202b961e3cf1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb0ce608a3386268bd76ee6642a4cc8e6818a29b +refs/heads/master: 62a720b889a37496d5f36d09875578956745d196 diff --git a/trunk/drivers/net/8139too.c b/trunk/drivers/net/8139too.c index 4c2cf7bbd252..76ef6efd5950 100644 --- a/trunk/drivers/net/8139too.c +++ b/trunk/drivers/net/8139too.c @@ -970,6 +970,7 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev, for (i = 0; i < 3; i++) ((u16 *) (dev->dev_addr))[i] = le16_to_cpu (read_eeprom (ioaddr, i + 7, addr_len)); + memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); /* The Rtl8139-specific entries in the device structure. */ dev->open = rtl8139_open; @@ -2465,6 +2466,7 @@ static struct ethtool_ops rtl8139_ethtool_ops = { .get_strings = rtl8139_get_strings, .get_stats_count = rtl8139_get_stats_count, .get_ethtool_stats = rtl8139_get_ethtool_stats, + .get_perm_addr = ethtool_op_get_perm_addr, }; static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)