diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2007-11-09 17:56:10 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:04:42 -0500 |
| commit | 458414b2e3d9dd7ee4510d18c119a7ccd3b43ec5 (patch) | |
| tree | 5080be9ae0e46f26b7803c874c1de769d0e68ef0 /drivers/net/b44.c | |
| parent | c272ef4403c271799a7f09a4ab7a236c86643843 (diff) | |
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>
Diffstat (limited to 'drivers/net/b44.c')
| -rw-r--r-- | drivers/net/b44.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c index 3d247f3f4a3c..49e91728a1d9 100644 --- a/drivers/net/b44.c +++ b/drivers/net/b44.c | |||
| @@ -2060,11 +2060,11 @@ static int __devinit b44_get_invariants(struct b44 *bp) | |||
| 2060 | 2060 | ||
| 2061 | if (sdev->bus->bustype == SSB_BUSTYPE_SSB && | 2061 | if (sdev->bus->bustype == SSB_BUSTYPE_SSB && |
| 2062 | instance > 1) { | 2062 | instance > 1) { |
| 2063 | addr = sdev->bus->sprom.r1.et1mac; | 2063 | addr = sdev->bus->sprom.et1mac; |
| 2064 | bp->phy_addr = sdev->bus->sprom.r1.et1phyaddr; | 2064 | bp->phy_addr = sdev->bus->sprom.et1phyaddr; |
| 2065 | } else { | 2065 | } else { |
| 2066 | addr = sdev->bus->sprom.r1.et0mac; | 2066 | addr = sdev->bus->sprom.et0mac; |
| 2067 | bp->phy_addr = sdev->bus->sprom.r1.et0phyaddr; | 2067 | bp->phy_addr = sdev->bus->sprom.et0phyaddr; |
| 2068 | } | 2068 | } |
| 2069 | memcpy(bp->dev->dev_addr, addr, 6); | 2069 | memcpy(bp->dev->dev_addr, addr, 6); |
| 2070 | 2070 | ||