This is a note to let you know that I've just added the patch titled
rtlwifi: rtl8192cu: Fix some code in RF handling
to the 3.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
rtlwifi-rtl8192cu-fix-some-code-in-rf-handling.patch
and it can be found in the queue-3.12 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From e9b0784bb9de3152e787ee779868c626b137fb3b Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Date: Mon, 18 Nov 2013 11:11:34 -0600
Subject: rtlwifi: rtl8192cu: Fix some code in RF handling
From: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
commit e9b0784bb9de3152e787ee779868c626b137fb3b upstream.
Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/wireless/rtlwifi/rtl8192cu/rf.c | 29 +++++++++++++++-------------
1 file changed, 16 insertions(+), 13 deletions(-)
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c
@@ -85,17 +85,15 @@ void rtl92cu_phy_rf6052_set_cck_txpower(
if (mac->act_scanning) {
tx_agc[RF90_PATH_A] = 0x3f3f3f3f;
tx_agc[RF90_PATH_B] = 0x3f3f3f3f;
- if (turbo_scanoff) {
- for (idx1 = RF90_PATH_A; idx1 <= RF90_PATH_B; idx1++) {
- tx_agc[idx1] = ppowerlevel[idx1] |
- (ppowerlevel[idx1] << 8) |
- (ppowerlevel[idx1] << 16) |
- (ppowerlevel[idx1] << 24);
- if (rtlhal->interface == INTF_USB) {
- if (tx_agc[idx1] > 0x20 &&
- rtlefuse->external_pa)
- tx_agc[idx1] = 0x20;
- }
+ for (idx1 = RF90_PATH_A; idx1 <= RF90_PATH_B; idx1++) {
+ tx_agc[idx1] = ppowerlevel[idx1] |
+ (ppowerlevel[idx1] << 8) |
+ (ppowerlevel[idx1] << 16) |
+ (ppowerlevel[idx1] << 24);
+ if (rtlhal->interface == INTF_USB) {
+ if (tx_agc[idx1] > 0x20 &&
+ rtlefuse->external_pa)
+ tx_agc[idx1] = 0x20;
}
}
} else {
@@ -107,7 +105,7 @@ void rtl92cu_phy_rf6052_set_cck_txpower(
TXHIGHPWRLEVEL_LEVEL2) {
tx_agc[RF90_PATH_A] = 0x00000000;
tx_agc[RF90_PATH_B] = 0x00000000;
- } else{
+ } else {
for (idx1 = RF90_PATH_A; idx1 <= RF90_PATH_B; idx1++) {
tx_agc[idx1] = ppowerlevel[idx1] |
(ppowerlevel[idx1] << 8) |
@@ -373,7 +371,12 @@ static void _rtl92c_write_ofdm_power_reg
regoffset == RTXAGC_B_MCS07_MCS04)
regoffset = 0xc98;
for (i = 0; i < 3; i++) {
- writeVal = (writeVal > 6) ? (writeVal - 6) : 0;
+ if (i != 2)
+ writeVal = (writeVal > 8) ?
+ (writeVal - 8) : 0;
+ else
+ writeVal = (writeVal > 6) ?
+ (writeVal - 6) : 0;
rtl_write_byte(rtlpriv, (u32)(regoffset + i),
(u8)writeVal);
}
Patches currently in stable-queue which might be from Larry.Finger@xxxxxxxxxxxx are
queue-3.12/b43-fix-lockdep-splat.patch
queue-3.12/staging-r8712u-set-device-type-to-wlan.patch
queue-3.12/rtlwifi-redo-register-save-locations.patch
queue-3.12/rtlwifi-rtl8192cu-add-new-device-id.patch
queue-3.12/rtlwifi-rtl8192c-add-new-definitions-in-the-dm_common-header.patch
queue-3.12/b43-fix-the-wrong-assignment-of-status.freq-in-b43_rx.patch
queue-3.12/b43-fix-unload-oops-if-firmware-is-not-available.patch
queue-3.12/rtlwifi-rtl8192cu-add-new-firmware.patch
queue-3.12/b43legacy-fix-unload-oops-if-firmware-is-not-available.patch
queue-3.12/rtlwifi-rtl8192cu-fix-some-code-in-rf-handling.patch
queue-3.12/rtlwifi-set-the-link-state.patch
queue-3.12/rtlwifi-increase-the-rx-queue-length-for-usb-drivers.patch
queue-3.12/rtlwifi-rtl8192c-add-routines-to-save-restore-power-index-registers.patch
queue-3.12/rtlwifi-rtl8192c-prevent-reconnect-attempts-if-not-connected.patch
queue-3.12/rtlwifi-rtl8188ee-fix-typo-in-code.patch
queue-3.12/rtlwifi-rtl8192cu-update-the-power-index-registers.patch
queue-3.12/rtlwifi-add-missing-code-to-pwdb-statics-routine.patch
queue-3.12/rtlwifi-update-beacon-statistics-for-usb-driver.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html