summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-01-31 18:46:27 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-01-31 18:46:27 +0000
commit8945962a12aa476059b03c38a07ffb238e2db1c9 (patch)
tree17072db1a6da870eb4f3214b6d5b00f4f18618f4
parent78a078b595a44f40cc58c6407f2712ce04bbe6b2 (diff)
[package] mac80211/ath9k: replace the accidentaly committed patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14331 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch20
1 files changed, 2 insertions, 18 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 85518a203..a293d96cb 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,38 +1,22 @@
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
-@@ -989,6 +989,11 @@ static void ath_unregister_led(struct at
+@@ -989,6 +989,9 @@ static void ath_unregister_led(struct at
static void ath_deinit_leds(struct ath_softc *sc)
{
-+#if 0
+ if (AR_SREV_9100(sc->sc_ah))
+ return;
-+#endif
+
ath_unregister_led(&sc->assoc_led);
sc->sc_flags &= ~SC_OP_LED_ASSOCIATED;
ath_unregister_led(&sc->tx_led);
-@@ -1002,6 +1007,11 @@ static void ath_init_leds(struct ath_sof
+@@ -1002,6 +1005,9 @@ static void ath_init_leds(struct ath_sof
char *trigger;
int ret;
-+#if 0
+ if (AR_SREV_9100(sc->sc_ah))
+ return;
-+#endif
+
/* Configure gpio 1 for output */
ath9k_hw_cfg_output(sc->sc_ah, ATH_LED_PIN,
AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
---- a/drivers/net/wireless/ath9k/hw.c
-+++ b/drivers/net/wireless/ath9k/hw.c
-@@ -3527,6 +3527,9 @@ void ath9k_hw_cfg_output(struct ath_hal
-
- void ath9k_hw_set_gpio(struct ath_hal *ah, u32 gpio, u32 val)
- {
-+ if (AR_SREV_9100(ah))
-+ return;
-+
- REG_RMW(ah, AR_GPIO_IN_OUT, ((val & 1) << gpio),
- AR_GPIO_BIT(gpio));
- }