mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-16 07:35:14 +00:00
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>
This commit is contained in:
parent
c272ef4403
commit
458414b2e3
1 changed files with 4 additions and 4 deletions
|
@ -2060,11 +2060,11 @@ static int __devinit b44_get_invariants(struct b44 *bp)
|
||||||
|
|
||||||
if (sdev->bus->bustype == SSB_BUSTYPE_SSB &&
|
if (sdev->bus->bustype == SSB_BUSTYPE_SSB &&
|
||||||
instance > 1) {
|
instance > 1) {
|
||||||
addr = sdev->bus->sprom.r1.et1mac;
|
addr = sdev->bus->sprom.et1mac;
|
||||||
bp->phy_addr = sdev->bus->sprom.r1.et1phyaddr;
|
bp->phy_addr = sdev->bus->sprom.et1phyaddr;
|
||||||
} else {
|
} else {
|
||||||
addr = sdev->bus->sprom.r1.et0mac;
|
addr = sdev->bus->sprom.et0mac;
|
||||||
bp->phy_addr = sdev->bus->sprom.r1.et0phyaddr;
|
bp->phy_addr = sdev->bus->sprom.et0phyaddr;
|
||||||
}
|
}
|
||||||
memcpy(bp->dev->dev_addr, addr, 6);
|
memcpy(bp->dev->dev_addr, addr, 6);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue