---

yaml --- r: 10199 b: refs/heads/master c: 2160de5 h: refs/heads/master i: 10197: c2517b0 10195: 5a93a2c 10191: 97984f0 v: v3
git-mirror · Sep 14, 2005 · a405da9 · a405da9
1 parent 95a3a06
commit a405da9
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: 62a720b889a37496d5f36d09875578956745d196
+refs/heads/master: 2160de53cc17a40ad07bd38bf52dd0bb72dd5183
diff --git 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;