diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2013-03-27 08:37:08 +0100 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-03-27 11:07:05 -0400 |
commit | 2e1253d640eb7f8707d2591c93097c1e9f9c71d5 (patch) | |
tree | 99a9fb3b84244a9282e28c6f30ef76cc4889a6bb | |
parent | 8ac3e99e693cb876776646c07f0a954a17ee3017 (diff) | |
download | linux-2e1253d640eb7f8707d2591c93097c1e9f9c71d5.tar.gz linux-2e1253d640eb7f8707d2591c93097c1e9f9c71d5.tar.bz2 linux-2e1253d640eb7f8707d2591c93097c1e9f9c71d5.zip |
b43: N-PHY: use more bits for offset in RSSI calibration
When calculating "offset" for final RSSI calibration we're using numbers
bigger than s8 can hold. We have for example:
offset[j] = 232 - poll_results[j];
formula. If poll_results[j] is small enough (it usually is) we treat
number's bit as a sign bit. For example 232 - 1 becomes:
0xE8 - 0x1 = 0xE7, which is not 231 but -25.
This code was introduced in e0c9a0219a8f542e3946fe972a68aacf8c3f906c
and caused stability regression on some cards, for ex. BCM4322.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/b43/phy_n.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c index e014a7a8154d..e8486c1e091a 100644 --- a/drivers/net/wireless/b43/phy_n.c +++ b/drivers/net/wireless/b43/phy_n.c @@ -1564,7 +1564,7 @@ static void b43_nphy_rev3_rssi_cal(struct b43_wldev *dev) u16 clip_off[2] = { 0xFFFF, 0xFFFF }; u8 vcm_final = 0; - s8 offset[4]; + s32 offset[4]; s32 results[8][4] = { }; s32 results_min[4] = { }; s32 poll_results[4] = { }; @@ -1732,7 +1732,7 @@ static void b43_nphy_rev2_rssi_cal(struct b43_wldev *dev, u8 type) u8 regs_save_radio[2]; u16 regs_save_phy[2]; - s8 offset[4]; + s32 offset[4]; u8 core; u8 rail; |