ssb: Fix extraction of values from SPROM

This fixes extraction of some values from the SPROM.
It mainly fixes extraction of antenna related values, which
is needed for another b43 fix sent later.

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 1 insertions, 6 deletions

diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index 14087fc20f3a..575fd9a5874d 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -3572,11 +3572,6 @@ static void b43legacy_sprom_fixup(struct ssb_bus *bus)
             bus->boardinfo.type == 0x4E &&
             bus->boardinfo.rev > 0x40)
                 bus->sprom.boardflags_lo |= B43legacy_BFL_PACTRL;
-
-        /* Convert Antennagain values to Q5.2 */
-        if (bus->sprom.antenna_gain_bg == 0xFF)
-                bus->sprom.antenna_gain_bg = 2; /* if unset, use 2 dBm */
-        bus->sprom.antenna_gain_bg <<= 2;
 }
 
 static void b43legacy_wireless_exit(struct ssb_device *dev,
diff --git a/drivers/net/wireless/b43legacy/phy.c b/drivers/net/wireless/b43legacy/phy.c
index 9d527e6d6ced..57c668f575fc 100644
--- a/drivers/net/wireless/b43legacy/phy.c
+++ b/drivers/net/wireless/b43legacy/phy.c
@@ -1859,7 +1859,7 @@ void b43legacy_phy_xmitpower(struct b43legacy_wldev *dev)
          * which accounts for the factor of 4 */
 #define REG_MAX_PWR 20
         max_pwr = min(REG_MAX_PWR * 4
-                      - dev->dev->bus->sprom.antenna_gain_bg
+                      - dev->dev->bus->sprom.antenna_gain.ghz24.a0
                       - 0x6, max_pwr);
 
         /* find the desired power in Q5.2 - power_level is in dBm