diff --git a/[refs] b/[refs] index 68e1db9b53af..a7197c5193c3 100644 --- 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 index 3d247f3f4a3c..49e91728a1d9 100644 --- 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);