From a405da9d1552fb2a092c453dbee9eff371fcee78 Mon Sep 17 00:00:00 2001 From: "John W. Linville" Date: Mon, 12 Sep 2005 10:48:55 -0400 Subject: [PATCH] --- yaml --- r: 10199 b: refs/heads/master c: 2160de53cc17a40ad07bd38bf52dd0bb72dd5183 h: refs/heads/master i: 10197: c2517b0585f301b110c3f12352a6ff7fd0c89e61 10195: 5a93a2c26decda8c6fe920495937e8ee1577c2bd 10191: 97984f030181dd230aefa5c23d46db39c8573d93 v: v3 --- [refs] | 2 +- trunk/drivers/net/b44.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 202b961e3cf1..ec385fd9b19d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62a720b889a37496d5f36d09875578956745d196 +refs/heads/master: 2160de53cc17a40ad07bd38bf52dd0bb72dd5183 diff --git a/trunk/drivers/net/b44.c b/trunk/drivers/net/b44.c index 94939f570f78..d27e870e59ab 100644 --- a/trunk/drivers/net/b44.c +++ b/trunk/drivers/net/b44.c @@ -1676,6 +1676,7 @@ static struct ethtool_ops b44_ethtool_ops = { .set_pauseparam = b44_set_pauseparam, .get_msglevel = b44_get_msglevel, .set_msglevel = b44_set_msglevel, + .get_perm_addr = ethtool_op_get_perm_addr, }; static 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) bp->dev->dev_addr[3] = eeprom[80]; bp->dev->dev_addr[4] = eeprom[83]; bp->dev->dev_addr[5] = eeprom[82]; + memcpy(bp->dev->perm_addr, bp->dev->dev_addr, bp->dev->addr_len); bp->phy_addr = eeprom[90] & 0x1f;