diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-01-24 18:54:16 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-01-24 18:54:16 +0000 |
| commit | 9b34dfb5715cceeddb974751bf60c4766cbf700b (patch) | |
| tree | d76d3bf6a8a28328e24e0c2a3d27aaca20233c9d /package/mac80211/patches/510-ath9k_led_cleanup.patch | |
| parent | 18c4d8389eb23d8dc5caaebd6a5bb8e3d130ed2f (diff) | |
| download | master-31e0f0ae-9b34dfb5715cceeddb974751bf60c4766cbf700b.tar.gz master-31e0f0ae-9b34dfb5715cceeddb974751bf60c4766cbf700b.tar.bz2 master-31e0f0ae-9b34dfb5715cceeddb974751bf60c4766cbf700b.zip | |
mac80211: update to wireless-testing 2011-01-24
SVN-Revision: 25093
Diffstat (limited to 'package/mac80211/patches/510-ath9k_led_cleanup.patch')
| -rw-r--r-- | package/mac80211/patches/510-ath9k_led_cleanup.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/package/mac80211/patches/510-ath9k_led_cleanup.patch b/package/mac80211/patches/510-ath9k_led_cleanup.patch index 570639d214..ad54338c85 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 -@@ -441,26 +441,20 @@ void ath9k_btcoex_timer_pause(struct ath +@@ -447,26 +447,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 -@@ -625,15 +619,11 @@ struct ath_softc { +@@ -618,15 +612,11 @@ struct ath_softc { struct ath_beacon beacon; struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS]; @@ -57,8 +57,8 @@ + struct led_classdev led_cdev; +#endif - int beacon_interval; - + struct ath9k_hw_cal_data caldata; + int last_rssi; --- a/drivers/net/wireless/ath/ath9k/gpio.c +++ b/drivers/net/wireless/ath/ath9k/gpio.c @@ -20,120 +20,25 @@ @@ -253,9 +253,9 @@ /* Rfkill */ --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c -@@ -1281,9 +1281,6 @@ static void ath9k_stop(struct ieee80211_ +@@ -1259,9 +1259,6 @@ static void ath9k_stop(struct ieee80211_ - aphy->state = ATH_WIPHY_INACTIVE; + mutex_lock(&sc->mutex); - if (led_blink) - cancel_delayed_work_sync(&sc->ath_led_blink_work); @@ -287,7 +287,7 @@ static void ath9k_deinit_softc(struct ath_softc *sc); /* -@@ -747,6 +762,13 @@ int ath9k_init_device(u16 devid, struct +@@ -748,6 +763,13 @@ int ath9k_init_device(u16 devid, struct ath9k_init_txpower_limits(sc); |