---

yaml --- r: 10207 b: refs/heads/master c: 56230d5 h: refs/heads/master i: 10205: 66b76e4 10203: a66e9ab 10199: a405da9 10191: 97984f0 10175: 04ddc33 v: v3
git-mirror · Sep 14, 2005 · 7053d75 · 7053d75
1 parent 129a862
commit 7053d75
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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);