aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/b44.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index 94939f570f78..d27e870e59ab 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -1676,6 +1676,7 @@ static struct ethtool_ops b44_ethtool_ops = {
1676 .set_pauseparam = b44_set_pauseparam, 1676 .set_pauseparam = b44_set_pauseparam,
1677 .get_msglevel = b44_get_msglevel, 1677 .get_msglevel = b44_get_msglevel,
1678 .set_msglevel = b44_set_msglevel, 1678 .set_msglevel = b44_set_msglevel,
1679 .get_perm_addr = ethtool_op_get_perm_addr,
1679}; 1680};
1680 1681
1681static int b44_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 1682static int b44_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
@@ -1718,6 +1719,7 @@ static int __devinit b44_get_invariants(struct b44 *bp)
1718 bp->dev->dev_addr[3] = eeprom[80]; 1719 bp->dev->dev_addr[3] = eeprom[80];
1719 bp->dev->dev_addr[4] = eeprom[83]; 1720 bp->dev->dev_addr[4] = eeprom[83];
1720 bp->dev->dev_addr[5] = eeprom[82]; 1721 bp->dev->dev_addr[5] = eeprom[82];
1722 memcpy(bp->dev->perm_addr, bp->dev->dev_addr, bp->dev->addr_len);
1721 1723
1722 bp->phy_addr = eeprom[90] & 0x1f; 1724 bp->phy_addr = eeprom[90] & 0x1f;
1723 1725