Commit 458414b2 authored by Larry Finger's avatar Larry Finger Committed by David S. Miller
Browse files

b44: Convert to use of the new SPROM structure 



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

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c272ef44

drivers/net/b44.c

+4 −4
Original line number Diff line number Diff line
@@ -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);