Ignore:
Timestamp:
2011-08-31T08:34:53+02:00 (5 years ago)
Author:
nbd
Message:

ath9k: merge a pending fix for 5 ghz rx latency

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/mac80211/patches/581-ath9k_use_reset_work.patch

    r28132 r28137  
    5858--- a/drivers/net/wireless/ath/ath9k/main.c 
    5959+++ b/drivers/net/wireless/ath/ath9k/main.c 
    60 @@ -595,74 +595,6 @@ static void ath_node_detach(struct ath_s 
     60@@ -236,6 +236,7 @@ static int ath_set_channel(struct ath_so 
     61        del_timer_sync(&common->ani.timer); 
     62        cancel_work_sync(&sc->paprd_work); 
     63        cancel_work_sync(&sc->hw_check_work); 
     64+       cancel_work_sync(&sc->hw_reset_work); 
     65        cancel_delayed_work_sync(&sc->tx_complete_work); 
     66        cancel_delayed_work_sync(&sc->hw_pll_work); 
     67  
     68@@ -595,74 +596,6 @@ static void ath_node_detach(struct ath_s 
    6169                ath_tx_node_cleanup(sc, an); 
    6270 } 
     
    133141 void ath9k_tasklet(unsigned long data) 
    134142 { 
    135 @@ -675,9 +607,7 @@ void ath9k_tasklet(unsigned long data) 
     143@@ -675,9 +608,7 @@ void ath9k_tasklet(unsigned long data) 
    136144  
    137145        if ((status & ATH9K_INT_FATAL) || 
     
    144152        } 
    145153  
    146 @@ -968,13 +898,14 @@ void ath_radio_disable(struct ath_softc  
     154@@ -968,13 +899,14 @@ void ath_radio_disable(struct ath_softc  
    147155        ath9k_ps_restore(sc); 
    148156 } 
     
    160168  
    161169        /* Stop ANI */ 
    162 @@ -1035,6 +966,84 @@ int ath_reset(struct ath_softc *sc, bool 
     170@@ -1035,6 +967,84 @@ int ath_reset(struct ath_softc *sc, bool 
    163171        return r; 
    164172 } 
     
    245253 /* mac80211 callbacks */ 
    246254 /**********************/ 
     255@@ -1227,6 +1237,7 @@ static void ath9k_stop(struct ieee80211_ 
     256        cancel_delayed_work_sync(&sc->hw_pll_work); 
     257        cancel_work_sync(&sc->paprd_work); 
     258        cancel_work_sync(&sc->hw_check_work); 
     259+       cancel_work_sync(&sc->hw_reset_work); 
     260  
     261        if (sc->sc_flags & SC_OP_INVALID) { 
     262                ath_dbg(common, ATH_DBG_ANY, "Device not present\n"); 
    247263--- a/drivers/net/wireless/ath/ath9k/xmit.c 
    248264+++ b/drivers/net/wireless/ath/ath9k/xmit.c 
     
    260276  
    261277 static bool ath_lookup_legacy(struct ath_buf *bf) 
     278@@ -1357,7 +1359,7 @@ void ath_txq_schedule(struct ath_softc * 
     279        struct ath_atx_ac *ac, *ac_tmp, *last_ac; 
     280        struct ath_atx_tid *tid, *last_tid; 
     281  
     282-       if (list_empty(&txq->axq_acq) || 
     283+       if ((sc->sc_flags & SC_OP_HW_RESET) || list_empty(&txq->axq_acq) || 
     284            txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH) 
     285                return; 
     286  
    262287@@ -2184,6 +2186,9 @@ static void ath_tx_processq(struct ath_s 
    263288  
Note: See TracChangeset for help on using the changeset viewer.