---

yaml --- r: 87832 b: refs/heads/master c: 5ea7963 h: refs/heads/master v: v3
git-mirror · Mar 26, 2008 · 0391cf9 · 0391cf9
1 parent 231f0bd
commit 0391cf9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ef2977d414cc196baba0fb53509c5f8cd9154b4
+refs/heads/master: 5ea79631c0c47d28831a0635e8af9da539d449cd
diff --git a/trunk/drivers/net/b44.c b/trunk/drivers/net/b44.c
@@ -2082,6 +2082,11 @@ static int __devinit b44_get_invariants(struct b44 *bp)
 		addr = sdev->bus->sprom.et0mac;
 		bp->phy_addr = sdev->bus->sprom.et0phyaddr;
 	}
+	/* Some ROMs have buggy PHY addresses with the high
+	 * bits set (sign extension?). Truncate them to a
+	 * valid PHY address. */
+	bp->phy_addr &= 0x1F;
+
 	memcpy(bp->dev->dev_addr, addr, 6);
 
 	if (!is_valid_ether_addr(&bp->dev->dev_addr[0])){