Ignore:
Timestamp:
2011-02-24T02:56:10+01:00 (6 years ago)
Author:
nbd
Message:

mac80211: backport latest version from trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/backfire/package/mac80211/patches/510-ath9k_led_cleanup.patch

    r25198 r25693  
    11--- a/drivers/net/wireless/ath/ath9k/ath9k.h 
    22+++ b/drivers/net/wireless/ath/ath9k/ath9k.h 
    3 @@ -447,26 +447,20 @@ void ath9k_btcoex_timer_pause(struct ath 
     3@@ -449,26 +449,20 @@ void ath9k_btcoex_timer_pause(struct ath 
    44  
    55 #define ATH_LED_PIN_DEF                1 
     
    3939 /* Antenna diversity/combining */ 
    4040 #define ATH_ANT_RX_CURRENT_SHIFT 4 
    41 @@ -618,15 +612,11 @@ struct ath_softc { 
     41@@ -620,15 +614,11 @@ struct ath_softc { 
    4242        struct ath_beacon beacon; 
    4343        struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS]; 
     
    254254--- a/drivers/net/wireless/ath/ath9k/main.c 
    255255+++ b/drivers/net/wireless/ath/ath9k/main.c 
    256 @@ -1259,9 +1259,6 @@ static void ath9k_stop(struct ieee80211_ 
     256@@ -1204,9 +1204,6 @@ static void ath9k_stop(struct ieee80211_ 
    257257  
    258258        mutex_lock(&sc->mutex); 
     
    262262- 
    263263        cancel_delayed_work_sync(&sc->tx_complete_work); 
     264        cancel_delayed_work_sync(&sc->hw_pll_work); 
    264265        cancel_work_sync(&sc->paprd_work); 
    265         cancel_work_sync(&sc->hw_check_work); 
    266266--- a/drivers/net/wireless/ath/ath9k/init.c 
    267267+++ b/drivers/net/wireless/ath/ath9k/init.c 
     
    288288  
    289289 /* 
    290 @@ -748,6 +763,13 @@ int ath9k_init_device(u16 devid, struct  
     290@@ -746,6 +761,13 @@ int ath9k_init_device(u16 devid, struct  
    291291  
    292292        ath9k_init_txpower_limits(sc); 
Note: See TracChangeset for help on using the changeset viewer.