mac80211: sync with changes to patches submitted upstream

[openwrt.git] / package / mac80211 / patches / 401-ath9k-dont-register-leds-on-ar9100.patch

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 afaabb1..2a9bdc8 100644 (file)
--- 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,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1057,6 +1057,9 @@ static void ath_unregister_led(struct at
+@@ -1139,6 +1139,9 @@ static void ath_unregister_led(struct at
  
  static void ath_deinit_leds(struct ath_softc *sc)
  {
@@ -10,13 +10,13 @@
        ath_unregister_led(&sc->assoc_led);
        sc->sc_flags &= ~SC_OP_LED_ASSOCIATED;
        ath_unregister_led(&sc->tx_led);
-@@ -1070,6 +1073,9 @@ static void ath_init_leds(struct ath_sof
-       char *trigger;
-       int ret;
+@@ -1157,6 +1160,9 @@ static void ath_init_leds(struct ath_sof
+       else
+               sc->sc_ah->led_pin = ATH_LED_PIN_DEF;
  
 +      if (AR_SREV_9100(sc->sc_ah))
 +              return;
 +
        /* Configure gpio 1 for output */
-       ath9k_hw_cfg_output(sc->sc_ah, ATH_LED_PIN,
+       ath9k_hw_cfg_output(sc->sc_ah, sc->sc_ah->led_pin,
                            AR_GPIO_OUTPUT_MUX_AS_OUTPUT);