diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-02-08 19:31:43 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-02-08 19:31:43 +0000 |
| commit | d807f70e4781773557c4aa8ed9ee5062b41568fb (patch) | |
| tree | 666597b535b8df74f5bdf7d260cac21389bbce9b /package/mac80211/patches/510-ath9k_led_cleanup.patch | |
| parent | b32ae97fd6a8d14dcac4801ab1dcf0d9533a0f6e (diff) | |
| download | upstream-d807f70e4781773557c4aa8ed9ee5062b41568fb.tar.gz upstream-d807f70e4781773557c4aa8ed9ee5062b41568fb.tar.bz2 upstream-d807f70e4781773557c4aa8ed9ee5062b41568fb.zip | |
mac80211: update to wireless-testing 2010-02-07
SVN-Revision: 25425
Diffstat (limited to 'package/mac80211/patches/510-ath9k_led_cleanup.patch')
| -rw-r--r-- | package/mac80211/patches/510-ath9k_led_cleanup.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/mac80211/patches/510-ath9k_led_cleanup.patch b/package/mac80211/patches/510-ath9k_led_cleanup.patch index ad54338c85..ded236cd9f 100644 --- a/package/mac80211/patches/510-ath9k_led_cleanup.patch +++ b/package/mac80211/patches/510-ath9k_led_cleanup.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h -@@ -447,26 +447,20 @@ void ath9k_btcoex_timer_pause(struct ath +@@ -449,26 +449,20 @@ void ath9k_btcoex_timer_pause(struct ath #define ATH_LED_PIN_DEF 1 #define ATH_LED_PIN_9287 8 @@ -38,7 +38,7 @@ /* Antenna diversity/combining */ #define ATH_ANT_RX_CURRENT_SHIFT 4 -@@ -618,15 +612,11 @@ struct ath_softc { +@@ -620,15 +614,11 @@ struct ath_softc { struct ath_beacon beacon; struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS]; @@ -253,7 +253,7 @@ /* Rfkill */ --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c -@@ -1259,9 +1259,6 @@ static void ath9k_stop(struct ieee80211_ +@@ -1204,9 +1204,6 @@ static void ath9k_stop(struct ieee80211_ mutex_lock(&sc->mutex); @@ -261,8 +261,8 @@ - cancel_delayed_work_sync(&sc->ath_led_blink_work); - cancel_delayed_work_sync(&sc->tx_complete_work); + cancel_delayed_work_sync(&sc->hw_pll_work); cancel_work_sync(&sc->paprd_work); - cancel_work_sync(&sc->hw_check_work); --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c @@ -145,6 +145,21 @@ static struct ieee80211_rate ath9k_legac @@ -287,7 +287,7 @@ static void ath9k_deinit_softc(struct ath_softc *sc); /* -@@ -748,6 +763,13 @@ int ath9k_init_device(u16 devid, struct +@@ -746,6 +761,13 @@ int ath9k_init_device(u16 devid, struct ath9k_init_txpower_limits(sc); |