Ignore:
Timestamp:
2011-08-30T09:46:38+02:00 (5 years ago)
Author:
nbd
Message:

ath9k: add some more minor hw reset related fixes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/mac80211/patches/582-ath9k_merge_reset_functions.patch

    r28122 r28129  
    118118  
    119119        ath9k_cmn_update_txpow(ah, sc->curtxpow, 
    120 @@ -296,21 +270,93 @@ static int ath_set_channel(struct ath_so 
     120@@ -296,21 +270,95 @@ static int ath_set_channel(struct ath_so 
    121121        ath9k_hw_set_interrupts(ah, ah->imask); 
    122122        ath9k_hw_enable_interrupts(ah); 
     
    153153+ 
    154154+       spin_lock_bh(&sc->sc_pcu_lock); 
     155+ 
     156+       sc->sc_flags &= ~SC_OP_HW_RESET; 
    155157  
    156158+       if (!(sc->sc_flags & SC_OP_OFFCHANNEL)) { 
     
    189191+out: 
    190192        spin_unlock_bh(&sc->sc_pcu_lock); 
    191 +       return 0; 
     193+       return r; 
    192194+} 
    193195+ 
     
    215217 } 
    216218  
    217 @@ -823,28 +869,13 @@ static void ath_radio_enable(struct ath_ 
     219@@ -823,28 +871,13 @@ static void ath_radio_enable(struct ath_ 
    218220                        channel->center_freq, r); 
    219221        } 
     
    245247  
    246248        ath9k_ps_restore(sc); 
    247 @@ -857,11 +888,10 @@ void ath_radio_disable(struct ath_softc  
     249@@ -857,11 +890,10 @@ void ath_radio_disable(struct ath_softc  
    248250        int r; 
    249251  
     
    259261        /* 
    260262         * Keep the LED on when the radio is disabled 
    261 @@ -872,13 +902,7 @@ void ath_radio_disable(struct ath_softc  
     263@@ -872,13 +904,7 @@ void ath_radio_disable(struct ath_softc  
    262264                ath9k_hw_cfg_gpio_input(ah, ah->led_pin); 
    263265        } 
     
    274276        if (!ah->curchan) 
    275277                ah->curchan = ath9k_cmn_get_curchannel(hw, ah); 
    276 @@ -900,48 +924,11 @@ void ath_radio_disable(struct ath_softc  
     278@@ -900,49 +926,11 @@ void ath_radio_disable(struct ath_softc  
    277279  
    278280 static int ath_reset(struct ath_softc *sc, bool retry_tx) 
     
    283285        int r; 
    284286  
     287-       sc->sc_flags &= ~SC_OP_HW_RESET; 
    285288-       sc->hw_busy_count = 0; 
    286289- 
     
    324327        if (retry_tx) { 
    325328                int i; 
    326 @@ -954,12 +941,6 @@ static int ath_reset(struct ath_softc *s 
     329@@ -955,12 +943,6 @@ static int ath_reset(struct ath_softc *s 
    327330                } 
    328331        } 
     
    337340  
    338341        return r; 
    339 @@ -969,9 +950,7 @@ void ath_reset_work(struct work_struct * 
     342@@ -970,9 +952,7 @@ void ath_reset_work(struct work_struct * 
    340343 { 
    341344        struct ath_softc *sc = container_of(work, struct ath_softc, hw_check_work); 
     
    347350  
    348351 void ath_hw_check(struct work_struct *work) 
    349 @@ -992,11 +971,8 @@ void ath_hw_check(struct work_struct *wo 
     352@@ -993,11 +973,8 @@ void ath_hw_check(struct work_struct *wo 
    350353        ath_dbg(common, ATH_DBG_RESET, "Possible baseband hang, " 
    351354                "busy=%d (try %d)\n", busy, sc->hw_busy_count + 1); 
     
    361364        } else if (busy >= 0) 
    362365                sc->hw_busy_count = 0; 
    363 @@ -1016,9 +992,7 @@ static void ath_hw_pll_rx_hang_check(str 
     366@@ -1017,9 +994,7 @@ static void ath_hw_pll_rx_hang_check(str 
    364367                        /* Rx is hung for more than 500ms. Reset it */ 
    365368                        ath_dbg(common, ATH_DBG_RESET, 
     
    372375                } 
    373376        } else 
    374 @@ -1089,28 +1063,6 @@ static int ath9k_start(struct ieee80211_ 
     377@@ -1090,28 +1065,6 @@ static int ath9k_start(struct ieee80211_ 
    375378                goto mutex_unlock; 
    376379        } 
     
    401404        ah->imask = ATH9K_INT_TX | ATH9K_INT_RXEOL | 
    402405                    ATH9K_INT_RXORN | ATH9K_INT_FATAL | 
    403 @@ -1133,12 +1085,14 @@ static int ath9k_start(struct ieee80211_ 
     406@@ -1134,12 +1087,14 @@ static int ath9k_start(struct ieee80211_ 
    404407  
    405408        /* Disable BMISS interrupt when we're not associated */ 
     
    420423        if ((ah->btcoex_hw.scheme != ATH_BTCOEX_CFG_NONE) && 
    421424            !ah->btcoex_hw.enabled) { 
    422 @@ -1231,10 +1185,7 @@ static void ath9k_stop(struct ieee80211_ 
     425@@ -1232,10 +1187,7 @@ static void ath9k_stop(struct ieee80211_ 
    423426  
    424427        mutex_lock(&sc->mutex); 
     
    432435        if (sc->sc_flags & SC_OP_INVALID) { 
    433436                ath_dbg(common, ATH_DBG_ANY, "Device not present\n"); 
    434 @@ -2351,9 +2302,11 @@ static void ath9k_flush(struct ieee80211 
     437@@ -2352,9 +2304,11 @@ static void ath9k_flush(struct ieee80211 
    435438        ath9k_ps_wakeup(sc); 
    436439        spin_lock_bh(&sc->sc_pcu_lock); 
Note: See TracChangeset for help on using the changeset viewer.