Changeset 7948


Ignore:
Timestamp:
2007-07-12T23:03:05+02:00 (11 years ago)
Author:
nbd
Message:

add missing changes from #1949

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/madwifi/patches/125-tpc_PR_1435.patch

    r7947 r7948  
    22=================================================================== 
    33--- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-12 21:15:09.998476392 +0200 
    4 +++ madwifi-ng-r2568-20070710/ath/if_ath.c      2007-07-12 21:15:23.995274023 +0200 
     4+++ madwifi-ng-r2568-20070710/ath/if_ath.c      2007-07-12 22:57:09.235191822 +0200 
    55@@ -273,9 +273,7 @@ 
    66 static char *autocreate = NULL; 
     
    5656 #endif 
    5757  
    58 @@ -8787,26 +8786,17 @@ 
     58@@ -8787,26 +8786,16 @@ 
    5959         * Search for the VAP that needs a txpow change, if any 
    6060         */ 
     
    7272        } 
    7373  
    74         ic->ic_newtxpowlimit = sc->sc_curtxpow = clamped_txpow; 
     74-       ic->ic_newtxpowlimit = sc->sc_curtxpow = clamped_txpow; 
     75+       sc->sc_curtxpow = clamped_txpow; 
    7576  
    7677-#ifdef ATH_CAP_TPC 
     
    7980-#else 
    8081-       if (ic->ic_newtxpowlimit != txpowlimit) 
    81 +       if ((tpc && ic->ic_newtxpowlimit >= txpowlimit) || 
    82 +           (ic->ic_newtxpowlimit != txpowlimit)) 
    83                 ath_hal_settxpowlimit(ah, ic->ic_newtxpowlimit); 
     82-               ath_hal_settxpowlimit(ah, ic->ic_newtxpowlimit); 
    8483-#endif 
     84+       if (clamped_txpow != txpowlimit) 
     85+               ath_hal_settxpowlimit(ah, clamped_txpow); 
    8586 } 
    8687  
     
    8990=================================================================== 
    9091--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_wireless.c        2007-07-12 21:15:44.080418612 +0200 
    91 +++ madwifi-ng-r2568-20070710/net80211/ieee80211_wireless.c     2007-07-12 21:16:19.034410527 +0200 
     92+++ madwifi-ng-r2568-20070710/net80211/ieee80211_wireless.c     2007-07-12 22:48:39.378136721 +0200 
    9293@@ -1403,6 +1403,7 @@ 
    9394        } else { 
Note: See TracChangeset for help on using the changeset viewer.