summaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-01-15 01:16:40 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-01-15 01:16:40 +0000
commit8f8c254d1f6b42d1a6f67b26e29fd4f2dcb91c61 (patch)
treeb87c43a312e236e4de933bf52b058894fd3c0927 /package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch
parent23e340324090a30fa3fa50aa2301a9ec6e78bd1f (diff)
mac80211: update to wireless-testing+wireless-2.6 from 2010-01-13
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19139 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch')
-rw-r--r--package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch20
1 files changed, 10 insertions, 10 deletions
diff --git a/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch b/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch
index a4af5c98d..96c22a0d0 100644
--- a/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch
+++ b/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch
@@ -1,8 +1,8 @@
---- a/drivers/net/wireless/ath/ath9k/main.c
-+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1103,6 +1103,9 @@ static void ath_unregister_led(struct at
+--- a/drivers/net/wireless/ath/ath9k/gpio.c
++++ b/drivers/net/wireless/ath/ath9k/gpio.c
+@@ -119,6 +119,9 @@ static void ath_unregister_led(struct at
- static void ath_deinit_leds(struct ath_softc *sc)
+ void ath_deinit_leds(struct ath_softc *sc)
{
+ if (AR_SREV_9100(sc->sc_ah))
+ return;
@@ -10,13 +10,13 @@
ath_unregister_led(&sc->assoc_led);
sc->sc_flags &= ~SC_OP_LED_ASSOCIATED;
ath_unregister_led(&sc->tx_led);
-@@ -1121,6 +1124,9 @@ static void ath_init_leds(struct ath_sof
- else
- sc->sc_ah->led_pin = ATH_LED_PIN_DEF;
+@@ -132,6 +135,9 @@ void ath_init_leds(struct ath_softc *sc)
+ char *trigger;
+ int ret;
+ if (AR_SREV_9100(sc->sc_ah))
+ return;
+
- /* Configure gpio 1 for output */
- ath9k_hw_cfg_output(sc->sc_ah, sc->sc_ah->led_pin,
- AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
+ if (AR_SREV_9287(sc->sc_ah))
+ sc->sc_ah->led_pin = ATH_LED_PIN_9287;
+ else