Changeset 39455


Ignore:
Timestamp:
2014-02-03T11:53:24+01:00 (4 years ago)
Author:
nbd
Message:

ath9k: 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

    r39442 r39455  
     1commit e138e0ef9560c46ce93dbb22a728a57888e94d1c 
     2Author: Sujith Manoharan <c_manoha@qca.qualcomm.com> 
     3Date:   Mon Feb 3 13:31:37 2014 +0530 
     4 
     5    ath9k: Fix TX power calculation 
     6     
     7    The commit, "ath9k_hw: Fix incorrect Tx control power in AR9003 template" 
     8    fixed the incorrect values in the eeprom templates, but if 
     9    boards have already been calibrated with incorrect values, 
     10    they would still be using the wrong TX power. Fix this by assigning 
     11    a default value in such cases. 
     12     
     13    Cc: Rajkumar Manoharan <rmanohar@qti.qualcomm.com> 
     14    Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com> 
     15 
    116commit b9f268b5b01331c3c82179abca551429450e9417 
    217Author: Michal Kazior <michal.kazior@tieto.com> 
     
    21392154  
    21402155        switch (event) { 
     2156--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c 
     2157+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c 
     2158@@ -5065,6 +5065,10 @@ static u16 ar9003_hw_get_max_edge_power( 
     2159                        break; 
     2160                } 
     2161        } 
     2162+ 
     2163+       if (is2GHz && !twiceMaxEdgePower) 
     2164+               twiceMaxEdgePower = 60; 
     2165+ 
     2166        return twiceMaxEdgePower; 
     2167 } 
     2168  
Note: See TracChangeset for help on using the changeset viewer.