diff options
| author | Rafał Miłecki | 2010-11-28 12:59:45 +0100 |
|---|---|---|
| committer | John W. Linville | 2010-12-02 20:37:01 +0100 |
| commit | 8cbe6e66889d2e4dbea37b2fc6f276bd69d1ef67 (patch) | |
| tree | 787e1cff9b00e004886c13fab3a09719f2821611 /drivers/net/wireless/b43 | |
| parent | b43: N-PHY: initialize perical variable, add missing call to CCA reset (diff) | |
| download | kernel-qcow2-linux-8cbe6e66889d2e4dbea37b2fc6f276bd69d1ef67.tar.gz kernel-qcow2-linux-8cbe6e66889d2e4dbea37b2fc6f276bd69d1ef67.tar.xz kernel-qcow2-linux-8cbe6e66889d2e4dbea37b2fc6f276bd69d1ef67.zip | |
b43: N-PHY: fix RSSI calibration
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/b43')
| -rw-r--r-- | drivers/net/wireless/b43/phy_n.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c index a721cac42976..85a7a60c54bf 100644 --- a/drivers/net/wireless/b43/phy_n.c +++ b/drivers/net/wireless/b43/phy_n.c @@ -2064,7 +2064,10 @@ static void b43_nphy_rev2_rssi_cal(struct b43_wldev *dev, u8 type) u16 class, override; u8 regs_save_radio[2]; u16 regs_save_phy[2]; + s8 offset[4]; + u8 core; + u8 rail; u16 clip_state[2]; u16 clip_off[2] = { 0xFFFF, 0xFFFF }; @@ -2165,12 +2168,11 @@ static void b43_nphy_rev2_rssi_cal(struct b43_wldev *dev, u8 type) if (results_min[i] == 248) offset[i] = code - 32; - if (i % 2 == 0) - b43_nphy_scale_offset_rssi(dev, 0, offset[i], 1, 0, - type); - else - b43_nphy_scale_offset_rssi(dev, 0, offset[i], 2, 1, - type); + core = (i / 2) ? 2 : 1; + rail = (i % 2) ? 1 : 0; + + b43_nphy_scale_offset_rssi(dev, 0, offset[i], core, rail, + type); } b43_radio_maskset(dev, B2055_C1_PD_RSSIMISC, 0xF8, state[0]); |