* [PATCH] rtlwifi: rtl8192cu: Fix duplicate if test
@ 2013-06-18 18:18 Larry Finger
2013-06-18 18:24 ` Sergei Shtylyov
0 siblings, 1 reply; 3+ messages in thread
From: Larry Finger @ 2013-06-18 18:18 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, Larry Finger, netdev, stable
A typo causes routine rtl92cu_phy_rf6052_set_cck_txpower() to test the
same condition twice. The problem was found using cppcheck-1.49, and the
proper fix was verified against the pre-mac80211 version of the code.
This patch was originally included as commit 1288aa4, but was accidentally
reverted in a later patch.
Reported-by: David Binderman <dcb314@hotmail.com> [original report]
Reported-by: Andrea Morello <andrea.merello@gmail.com> [report of accidental reversion]
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: stable <stable@kernel.org> [back to 2.6.39]
---
John,
Although this patch is trivial and could be included in the 3.10 stream,
I think we should not burden DaveM nor Linus with it this late in the 3.10
cycle. Please push it into the 3.11 stream.
Thanks,
Larry
---
drivers/net/wireless/rtlwifi/rtl8192cu/rf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c b/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c
index 953f1a0..2119313 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c
@@ -104,7 +104,7 @@ void rtl92cu_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
tx_agc[RF90_PATH_A] = 0x10101010;
tx_agc[RF90_PATH_B] = 0x10101010;
} else if (rtlpriv->dm.dynamic_txhighpower_lvl ==
- TXHIGHPWRLEVEL_LEVEL1) {
+ TXHIGHPWRLEVEL_LEVEL2) {
tx_agc[RF90_PATH_A] = 0x00000000;
tx_agc[RF90_PATH_B] = 0x00000000;
} else{
--
1.8.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] rtlwifi: rtl8192cu: Fix duplicate if test
2013-06-18 18:18 [PATCH] rtlwifi: rtl8192cu: Fix duplicate if test Larry Finger
@ 2013-06-18 18:24 ` Sergei Shtylyov
0 siblings, 0 replies; 3+ messages in thread
From: Sergei Shtylyov @ 2013-06-18 18:24 UTC (permalink / raw)
To: Larry Finger; +Cc: linville, linux-wireless, netdev, stable
Hello.
On 06/18/2013 10:18 PM, Larry Finger wrote:
> A typo causes routine rtl92cu_phy_rf6052_set_cck_txpower() to test the
> same condition twice. The problem was found using cppcheck-1.49, and the
> proper fix was verified against the pre-mac80211 version of the code.
> This patch was originally included as commit 1288aa4, but was accidentally
You probably forgot to specify the summary line of that commit.
> reverted in a later patch.
> Reported-by: David Binderman <dcb314@hotmail.com> [original report]
> Reported-by: Andrea Morello <andrea.merello@gmail.com> [report of accidental reversion]
> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
> Cc: stable <stable@kernel.org> [back to 2.6.39]
WBR, Sergei
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] rtlwifi: rtl8192cu: Fix duplicate if test
@ 2011-07-09 18:15 Larry Finger
0 siblings, 0 replies; 3+ messages in thread
From: Larry Finger @ 2011-07-09 18:15 UTC (permalink / raw)
To: John W Linville; +Cc: dcb314, george0505, linux-wireless
A typo causes routine rtl92cu_phy_rf6052_set_cck_txpower() to test the
same condition twice. The problem was found using cppcheck-1.49, and the
proper fix was verified against the pre-mac80211 version of the code.
Reported-by: David Binderman <dcb314@hotmail.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: stable <stable@kernel.org> [back to 2.6.39]
---
John,
Obviously, this is a bug in 3.0 and 2.6.39, but it has a minor impact.
I think we should just push it to 3.1 and let stable get it for the
earlier versions, but as usual, it is your call.
Larry
---
Index: wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c
===================================================================
--- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c
+++ wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c
@@ -104,7 +104,7 @@ void rtl92cu_phy_rf6052_set_cck_txpower(
tx_agc[RF90_PATH_A] = 0x10101010;
tx_agc[RF90_PATH_B] = 0x10101010;
} else if (rtlpriv->dm.dynamic_txhighpower_lvl ==
- TXHIGHPWRLEVEL_LEVEL1) {
+ TXHIGHPWRLEVEL_LEVEL2) {
tx_agc[RF90_PATH_A] = 0x00000000;
tx_agc[RF90_PATH_B] = 0x00000000;
} else{
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-06-18 18:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-18 18:18 [PATCH] rtlwifi: rtl8192cu: Fix duplicate if test Larry Finger
2013-06-18 18:24 ` Sergei Shtylyov
-- strict thread matches above, loose matches on Subject: below --
2011-07-09 18:15 Larry Finger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).