Ignore:
Timestamp:
2011-08-29T12:40:46+02:00 (5 years ago)
Author:
nbd
Message:

ath9k: fix disabling ani on reset

File:
1 edited

Legend:

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

    r28114 r28115  
    11--- a/drivers/net/wireless/ath/ath9k/main.c 
    22+++ b/drivers/net/wireless/ath/ath9k/main.c 
    3 @@ -212,83 +212,45 @@ static int ath_update_survey_stats(struc 
     3@@ -212,83 +212,46 @@ static int ath_update_survey_stats(struc 
    44        return ret; 
    55 } 
     
    2929        sc->hw_busy_count = 0; 
    3030- 
    31 -       del_timer_sync(&common->ani.timer); 
     31        del_timer_sync(&common->ani.timer); 
    3232        cancel_work_sync(&sc->paprd_work); 
    3333        cancel_work_sync(&sc->hw_check_work); 
     
    105105  
    106106        ath9k_cmn_update_txpow(ah, sc->curtxpow, 
    107 @@ -296,21 +258,89 @@ static int ath_set_channel(struct ath_so 
     107@@ -296,21 +259,89 @@ static int ath_set_channel(struct ath_so 
    108108        ath9k_hw_set_interrupts(ah, ah->imask); 
    109109        ath9k_hw_enable_interrupts(ah); 
     
    126126+       return true; 
    127127+} 
    128 + 
     128  
    129129+static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan, 
    130130+                             bool retry_tx) 
     
    173173+} 
    174174+ 
    175   
     175+ 
    176176+/* 
    177177+ * Set/change channels.  If the channel is really being changed, it's done 
     
    198198 } 
    199199  
    200 @@ -893,28 +923,13 @@ static void ath_radio_enable(struct ath_ 
     200@@ -893,28 +924,13 @@ static void ath_radio_enable(struct ath_ 
    201201                        channel->center_freq, r); 
    202202        } 
     
    228228  
    229229        ath9k_ps_restore(sc); 
    230 @@ -927,12 +942,8 @@ void ath_radio_disable(struct ath_softc  
     230@@ -927,12 +943,8 @@ void ath_radio_disable(struct ath_softc  
    231231        int r; 
    232232  
     
    241241         * Keep the LED on when the radio is disabled 
    242242         * during idle unassociated state. 
    243 @@ -942,13 +953,7 @@ void ath_radio_disable(struct ath_softc  
     243@@ -942,13 +954,7 @@ void ath_radio_disable(struct ath_softc  
    244244                ath9k_hw_cfg_gpio_input(ah, ah->led_pin); 
    245245        } 
     
    256256        if (!ah->curchan) 
    257257                ah->curchan = ath9k_cmn_get_curchannel(hw, ah); 
    258 @@ -970,48 +975,11 @@ void ath_radio_disable(struct ath_softc  
     258@@ -970,48 +976,11 @@ void ath_radio_disable(struct ath_softc  
    259259  
    260260 int ath_reset(struct ath_softc *sc, bool retry_tx) 
     
    306306        if (retry_tx) { 
    307307                int i; 
    308 @@ -1024,12 +992,6 @@ int ath_reset(struct ath_softc *sc, bool 
     308@@ -1024,12 +993,6 @@ int ath_reset(struct ath_softc *sc, bool 
    309309                } 
    310310        } 
     
    319319  
    320320        return r; 
    321 @@ -1081,28 +1043,6 @@ static int ath9k_start(struct ieee80211_ 
     321@@ -1081,28 +1044,6 @@ static int ath9k_start(struct ieee80211_ 
    322322                goto mutex_unlock; 
    323323        } 
     
    348348        ah->imask = ATH9K_INT_TX | ATH9K_INT_RXEOL | 
    349349                    ATH9K_INT_RXORN | ATH9K_INT_FATAL | 
    350 @@ -1125,12 +1065,14 @@ static int ath9k_start(struct ieee80211_ 
     350@@ -1125,12 +1066,14 @@ static int ath9k_start(struct ieee80211_ 
    351351  
    352352        /* Disable BMISS interrupt when we're not associated */ 
Note: See TracChangeset for help on using the changeset viewer.