From 7053d75db26f4d4554d34910236ec87b22690467 Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Mon, 12 Sep 2005 10:48:57 -0400
Subject: [PATCH] --- yaml --- r: 10207 b: refs/heads/master c:
 56230d538233ba037eb679b0fc0b218d33b9b8b8 h: refs/heads/master i:   10205:
 66b76e4c87894992503b376a36e77511f1f627e7   10203:
 a66e9ab5d016095bc8be8f0bd6ee9550d814150f   10199:
 a405da9d1552fb2a092c453dbee9eff371fcee78   10191:
 97984f030181dd230aefa5c23d46db39c8573d93   10175:
 04ddc33fdec456b6d9b6f772f9257a84346f5374 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/skge.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d3b92e599503..3a49601111d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d6525b7f74f9593e647f8c17b1de0f652e1f177
+refs/heads/master: 56230d538233ba037eb679b0fc0b218d33b9b8b8
diff --git a/trunk/drivers/net/skge.c b/trunk/drivers/net/skge.c
index d7c98515fdfd..757c83387a29 100644
--- a/trunk/drivers/net/skge.c
+++ b/trunk/drivers/net/skge.c
@@ -743,6 +743,7 @@ static struct ethtool_ops skge_ethtool_ops = {
 	.phys_id	= skge_phys_id,
 	.get_stats_count = skge_get_stats_count,
 	.get_ethtool_stats = skge_get_ethtool_stats,
+	.get_perm_addr	= ethtool_op_get_perm_addr,
 };
 
 /*
@@ -3080,6 +3081,7 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port,
 
 	/* read the mac address */
 	memcpy_fromio(dev->dev_addr, hw->regs + B2_MAC_1 + port*8, ETH_ALEN);
+	memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
 
 	/* device is off until link detection */
 	netif_carrier_off(dev);