aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2005-09-28 13:01:03 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-10-04 07:59:43 -0400
commit2995bfb7855aabd493f840af361f3dd7d221caea (patch)
treec1dabbfd2fe08db677cabd4ad07d54d0dc392c4d /drivers
parent9a7ae0a978263adb7d6b630f0c3c37c0133325e0 (diff)
[PATCH] sky2: add permanent address support.
Add permanent address support Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/sky2.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 57583fa86a9b..06beb71cb3c8 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -2698,6 +2698,7 @@ static struct ethtool_ops sky2_ethtool_ops = {
2698 .phys_id = sky2_phys_id, 2698 .phys_id = sky2_phys_id,
2699 .get_stats_count = sky2_get_stats_count, 2699 .get_stats_count = sky2_get_stats_count,
2700 .get_ethtool_stats = sky2_get_ethtool_stats, 2700 .get_ethtool_stats = sky2_get_ethtool_stats,
2701 .get_perm_addr = ethtool_op_get_perm_addr,
2701}; 2702};
2702 2703
2703/* Initialize network device */ 2704/* Initialize network device */
@@ -2766,6 +2767,7 @@ static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw,
2766 2767
2767 /* read the mac address */ 2768 /* read the mac address */
2768 memcpy_fromio(dev->dev_addr, hw->regs + B2_MAC_1 + port * 8, ETH_ALEN); 2769 memcpy_fromio(dev->dev_addr, hw->regs + B2_MAC_1 + port * 8, ETH_ALEN);
2770 memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
2769 2771
2770 /* device is off until link detection */ 2772 /* device is off until link detection */
2771 netif_carrier_off(dev); 2773 netif_carrier_off(dev);