Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index 4c2cf7bbd252..30bee11c48bd 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -552,7 +552,8 @@ const static struct {
 
         { "RTL-8100B/8139D",
           HW_REVID(1, 1, 1, 0, 1, 0, 1),
-          HasLWake,
+          HasHltClk /* XXX undocumented? */
+        | HasLWake,
         },
 
         { "RTL-8101",
@@ -970,6 +971,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 +2467,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)