---

yaml --- r: 15696 b: refs/heads/master c: 2995bfb h: refs/heads/master v: v3
git-mirror · Oct 4, 2005 · eb8b671 · eb8b671
1 parent a445817
commit eb8b671
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: 9a7ae0a978263adb7d6b630f0c3c37c0133325e0
+refs/heads/master: 2995bfb7855aabd493f840af361f3dd7d221caea
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
@@ -2698,6 +2698,7 @@ static struct ethtool_ops sky2_ethtool_ops = {
 	.phys_id = sky2_phys_id,
 	.get_stats_count = sky2_get_stats_count,
 	.get_ethtool_stats = sky2_get_ethtool_stats,
+	.get_perm_addr	= ethtool_op_get_perm_addr,
 };
 
 /* Initialize network device */
@@ -2766,6 +2767,7 @@ static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw,
 
 	/* 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);