b44: Convert to use of the new SPROM structure

The b44 driver is changed to use the new SPROM data structure.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index 3d247f3f4a3c375d285e10caf025fa6fc16f6d3b..49e91728a1d9b106a27b9bdeaa363281d0b61f0a 100644 (file)
--- a/drivers/net/b44.c
+++ b/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);