commit 6d6525b7f74f9593e647f8c17b1de0f652e1f177
author John W. Linville <linville@tuxdriver.com> Mon Sep 12 10:48:57 2005 -0400
committer Jeff Garzik <jgarzik@pobox.com> Wed Sep 14 08:30:02 2005 -0400
tree 229b049c611c79b9667b222ed306f662d0fcd2f0
parent db0276b060918fac94c9d216213a31ee02cdd73e

[PATCH] r8169: support ETHTOOL_GPERMADDR

Add support for ETHTOOL_GPERMADDR to r8169.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

drivers/net/r8169.c

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index f0471d1..cbc60ce 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -1028,6 +1028,7 @@
 	.get_strings		= rtl8169_get_strings,
 	.get_stats_count	= rtl8169_get_stats_count,
 	.get_ethtool_stats	= rtl8169_get_ethtool_stats,
+	.get_perm_addr		= ethtool_op_get_perm_addr,
 };
 
 static void rtl8169_write_gmii_reg_bit(void __iomem *ioaddr, int reg, int bitnum,
@@ -1512,6 +1513,7 @@
 	/* Get MAC address.  FIXME: read EEPROM */
 	for (i = 0; i < MAC_ADDR_LEN; i++)
 		dev->dev_addr[i] = RTL_R8(MAC0 + i);
+	memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
 
 	dev->open = rtl8169_open;
 	dev->hard_start_xmit = rtl8169_start_xmit;