From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Fri, 9 Nov 2007 22:56:10 +0000 (-0600)
Subject: b44: Convert to use of the new SPROM structure
X-Git-Tag: v2.6.25-rc1~1162^2~549
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=458414b2e3d9dd7ee4510d18c119a7ccd3b43ec5;p=linux-2.6

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 3d247f3f4a..49e91728a1 100644
--- 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);