| Message ID | 1371579497-5575-1-git-send-email-Larry.Finger@lwfinger.net |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
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 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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{
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(-)