diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-31 03:37:12 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-31 03:37:12 +0100 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /drivers/net/skge.c | |
| parent | ppc: remove duplicate export of cur_cpu_spec (diff) | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-serial (diff) | |
| download | linux-23fd07750a789a66fe88cf173d52a18f1a387da4.tar.xz linux-23fd07750a789a66fe88cf173d52a18f1a387da4.zip | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'drivers/net/skge.c')
| -rw-r--r-- | drivers/net/skge.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/skge.c b/drivers/net/skge.c index c2e6484ef138..572f121b1f4e 100644 --- a/drivers/net/skge.c +++ b/drivers/net/skge.c @@ -730,6 +730,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, }; /* @@ -3096,6 +3097,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); |