Ignore:
Timestamp:
2011-09-04T21:06:35+02:00 (5 years ago)
Author:
nbd
Message:

ath9k: merge latest changes from trunk (as of r28169)

File:
1 edited

Legend:

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

    r28140 r28170  
    119119  
    120120        ath9k_cmn_update_txpow(ah, sc->curtxpow, 
    121 @@ -297,21 +270,95 @@ static int ath_set_channel(struct ath_so 
     121@@ -297,21 +270,93 @@ static int ath_set_channel(struct ath_so 
    122122        ath9k_hw_set_interrupts(ah, ah->imask); 
    123123        ath9k_hw_enable_interrupts(ah); 
     
    154154+ 
    155155+       spin_lock_bh(&sc->sc_pcu_lock); 
    156 + 
    157 +       sc->sc_flags &= ~SC_OP_HW_RESET; 
    158156  
    159157+       if (!(sc->sc_flags & SC_OP_OFFCHANNEL)) { 
     
    218216 } 
    219217  
    220 @@ -824,28 +871,13 @@ static void ath_radio_enable(struct ath_ 
     218@@ -824,28 +869,13 @@ static void ath_radio_enable(struct ath_ 
    221219                        channel->center_freq, r); 
    222220        } 
     
    248246  
    249247        ath9k_ps_restore(sc); 
    250 @@ -858,11 +890,10 @@ void ath_radio_disable(struct ath_softc  
     248@@ -858,11 +888,10 @@ void ath_radio_disable(struct ath_softc  
    251249        int r; 
    252250  
     
    262260        /* 
    263261         * Keep the LED on when the radio is disabled 
    264 @@ -873,13 +904,7 @@ void ath_radio_disable(struct ath_softc  
     262@@ -873,13 +902,7 @@ void ath_radio_disable(struct ath_softc  
    265263                ath9k_hw_cfg_gpio_input(ah, ah->led_pin); 
    266264        } 
     
    277275        if (!ah->curchan) 
    278276                ah->curchan = ath9k_cmn_get_curchannel(hw, ah); 
    279 @@ -901,49 +926,11 @@ void ath_radio_disable(struct ath_softc  
     277@@ -901,48 +924,11 @@ void ath_radio_disable(struct ath_softc  
    280278  
    281279 static int ath_reset(struct ath_softc *sc, bool retry_tx) 
     
    286284        int r; 
    287285  
    288 -       sc->sc_flags &= ~SC_OP_HW_RESET; 
    289286-       sc->hw_busy_count = 0; 
    290287- 
     
    328325        if (retry_tx) { 
    329326                int i; 
    330 @@ -956,12 +943,6 @@ static int ath_reset(struct ath_softc *s 
     327@@ -955,12 +941,6 @@ static int ath_reset(struct ath_softc *s 
    331328                } 
    332329        } 
     
    341338  
    342339        return r; 
    343 @@ -971,9 +952,7 @@ void ath_reset_work(struct work_struct * 
     340@@ -970,9 +950,7 @@ void ath_reset_work(struct work_struct * 
    344341 { 
    345342        struct ath_softc *sc = container_of(work, struct ath_softc, hw_reset_work); 
     
    351348  
    352349 void ath_hw_check(struct work_struct *work) 
    353 @@ -994,11 +973,8 @@ void ath_hw_check(struct work_struct *wo 
     350@@ -993,11 +971,8 @@ void ath_hw_check(struct work_struct *wo 
    354351        ath_dbg(common, ATH_DBG_RESET, "Possible baseband hang, " 
    355352                "busy=%d (try %d)\n", busy, sc->hw_busy_count + 1); 
     
    365362        } else if (busy >= 0) 
    366363                sc->hw_busy_count = 0; 
    367 @@ -1018,9 +994,7 @@ static void ath_hw_pll_rx_hang_check(str 
     364@@ -1017,9 +992,7 @@ static void ath_hw_pll_rx_hang_check(str 
    368365                        /* Rx is hung for more than 500ms. Reset it */ 
    369366                        ath_dbg(common, ATH_DBG_RESET, 
     
    376373                } 
    377374        } else 
    378 @@ -1091,28 +1065,6 @@ static int ath9k_start(struct ieee80211_ 
     375@@ -1090,28 +1063,6 @@ static int ath9k_start(struct ieee80211_ 
    379376                goto mutex_unlock; 
    380377        } 
     
    405402        ah->imask = ATH9K_INT_TX | ATH9K_INT_RXEOL | 
    406403                    ATH9K_INT_RXORN | ATH9K_INT_FATAL | 
    407 @@ -1135,12 +1087,14 @@ static int ath9k_start(struct ieee80211_ 
     404@@ -1134,12 +1085,14 @@ static int ath9k_start(struct ieee80211_ 
    408405  
    409406        /* Disable BMISS interrupt when we're not associated */ 
     
    424421        if ((ah->btcoex_hw.scheme != ATH_BTCOEX_CFG_NONE) && 
    425422            !ah->btcoex_hw.enabled) { 
    426 @@ -1233,11 +1187,7 @@ static void ath9k_stop(struct ieee80211_ 
     423@@ -1232,11 +1185,7 @@ static void ath9k_stop(struct ieee80211_ 
    427424  
    428425        mutex_lock(&sc->mutex); 
     
    437434        if (sc->sc_flags & SC_OP_INVALID) { 
    438435                ath_dbg(common, ATH_DBG_ANY, "Device not present\n"); 
    439 @@ -2354,9 +2304,11 @@ static void ath9k_flush(struct ieee80211 
     436@@ -2353,9 +2302,11 @@ static void ath9k_flush(struct ieee80211 
    440437        ath9k_ps_wakeup(sc); 
    441438        spin_lock_bh(&sc->sc_pcu_lock); 
Note: See TracChangeset for help on using the changeset viewer.