mac80211: fix build of ipw2200

[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 85518a2..96c22a0 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,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
+--- 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 0

 +      if (AR_SREV_9100(sc->sc_ah))
 +              return;
 +      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);
 +
        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
+@@ -132,6 +135,9 @@ void ath_init_leds(struct ath_softc *sc)

        char *trigger;
        int ret;
  
        char *trigger;
        int ret;
  

-+#if 0

 +      if (AR_SREV_9100(sc->sc_ah))
 +              return;
 +      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));
- }
+       if (AR_SREV_9287(sc->sc_ah))
+               sc->sc_ah->led_pin = ATH_LED_PIN_9287;
+       else