Ignore:
Timestamp:
2011-09-01T20:15:44+02:00 (5 years ago)
Author:
nbd
Message:

ath9k: merge a fix for tx power limit testing (backport of r28143)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/backfire/package/mac80211/patches/300-pending_work.patch

    r28138 r28144  
    297297                tx_lat = MS(reg, AR_USEC_TX_LAT); 
    298298  
     299@@ -2441,13 +2450,13 @@ void ath9k_hw_set_txpowerlimit(struct at 
     300        struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah); 
     301        struct ath9k_channel *chan = ah->curchan; 
     302        struct ieee80211_channel *channel = chan->chan; 
     303-       int reg_pwr = min_t(int, MAX_RATE_POWER, regulatory->power_limit); 
     304+       int reg_pwr = min_t(int, MAX_RATE_POWER, limit); 
     305        int chan_pwr = channel->max_power * 2; 
     306  
     307        if (test) 
     308                reg_pwr = chan_pwr = MAX_RATE_POWER; 
     309  
     310-       regulatory->power_limit = min(limit, (u32) MAX_RATE_POWER); 
     311+       regulatory->power_limit = reg_pwr; 
     312  
     313        ah->eep_ops->set_txpower(ah, chan, 
     314                                 ath9k_regd_get_ctl(regulatory, chan), 
    299315--- a/drivers/net/wireless/ath/ath9k/reg.h 
    300316+++ b/drivers/net/wireless/ath/ath9k/reg.h 
Note: See TracChangeset for help on using the changeset viewer.