---

yaml --- r: 78999 b: refs/heads/master c: 458414b h: refs/heads/master i: 78997: 61fa169 78995: 270d662 78991: 5e1038e v: v3
git-mirror · Jan 28, 2008 · c6aece3 · c6aece3
1 parent 6bf3fde
commit c6aece3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c272ef4403c271799a7f09a4ab7a236c86643843
+refs/heads/master: 458414b2e3d9dd7ee4510d18c119a7ccd3b43ec5
diff --git a/trunk/drivers/net/b44.c b/trunk/drivers/net/b44.c
@@ -2060,11 +2060,11 @@ static int __devinit b44_get_invariants(struct b44 *bp)
 
 	if (sdev->bus->bustype == SSB_BUSTYPE_SSB &&
 	    instance > 1) {
-		addr = sdev->bus->sprom.r1.et1mac;
-		bp->phy_addr = sdev->bus->sprom.r1.et1phyaddr;
+		addr = sdev->bus->sprom.et1mac;
+		bp->phy_addr = sdev->bus->sprom.et1phyaddr;
 	} else {
-		addr = sdev->bus->sprom.r1.et0mac;
-		bp->phy_addr = sdev->bus->sprom.r1.et0phyaddr;
+		addr = sdev->bus->sprom.et0mac;
+		bp->phy_addr = sdev->bus->sprom.et0phyaddr;
 	}
 	memcpy(bp->dev->dev_addr, addr, 6);