Changeset 40691


Ignore:
Timestamp:
2014-05-03T23:14:52+02:00 (4 years ago)
Author:
nbd
Message:

ath5k: merge a tx power handling fix

Signed-off-by: Felix Fietkau <nbd@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/kernel/mac80211/patches/300-pending_work.patch

    r40687 r40691  
     1commit 4c8a3486cb577d40c1ef75f0a8dc9a04773eef83 
     2Author: Nickolay Ledovskikh <nledovskikh@gmail.com> 
     3Date:   Fri Apr 25 22:53:34 2014 +0400 
     4 
     5    ath5k: Fix AR5K_PHY_TXPOWER_RATE_MAX register value setting. 
     6     
     7    I was reading ath5k power setting code and 
     8    noticed typing error in ath5k_hw_txpower function. 
     9    Invalid value was written to AR5K_PHY_TXPOWER_RATE_MAX 
     10    register. 
     11     
     12    Signed-off-by: Nikolay Ledovskikh <nledovskikh@gmail.com> 
     13    Acked-by: Nick Kossifidis <mickflemm@gmail.com> 
     14    Signed-off-by: John W. Linville <linville@tuxdriver.com> 
     15 
    116commit 4d76248013dbb1948429555208900a585b0f351d 
    217Author: Janusz Dziedzic <janusz.dziedzic@tieto.com> 
     
    514529        {0x0000a3a8, 0x6a6a6a6a}, 
    515530        {0x0000a3ac, 0x6a6a6a6a}, 
     531--- a/drivers/net/wireless/ath/ath5k/phy.c 
     532+++ b/drivers/net/wireless/ath/ath5k/phy.c 
     533@@ -3709,8 +3709,8 @@ ath5k_hw_txpower(struct ath5k_hw *ah, st 
     534                        AR5K_REG_MS(AR5K_TUNE_MAX_TXPOWER, AR5K_TPC_CHIRP), 
     535                        AR5K_TPC); 
     536        } else { 
     537-               ath5k_hw_reg_write(ah, AR5K_PHY_TXPOWER_RATE_MAX | 
     538-                       AR5K_TUNE_MAX_TXPOWER, AR5K_PHY_TXPOWER_RATE_MAX); 
     539+               ath5k_hw_reg_write(ah, AR5K_TUNE_MAX_TXPOWER, 
     540+                       AR5K_PHY_TXPOWER_RATE_MAX); 
     541        } 
     542  
     543        return 0; 
Note: See TracChangeset for help on using the changeset viewer.