mac80211: update to wireless-testing 2011-03-11

[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 409-ath9k_platform_settings.patch

diff --git a/package/mac80211/patches/409-ath9k_platform_settings.patch b/package/mac80211/patches/409-ath9k_platform_settings.patch
index 23a5887a1d99b2a6f437e3f5950985d3ea57c69f..6ce43b6005cfb81f96a7b10b053bbb97f028a310 100644 (file)
--- a/package/mac80211/patches/409-ath9k_platform_settings.patch
+++ b/package/mac80211/patches/409-ath9k_platform_settings.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/init.c
 +++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -538,8 +538,14 @@ static int ath9k_init_softc(u16 devid, s
+@@ -553,8 +553,14 @@ static int ath9k_init_softc(u16 devid, s
        ah->hw_version.subsysid = subsysid;
        sc->sc_ah = ah;
  
@@ -29,17 +29,21 @@
  
 --- a/drivers/net/wireless/ath/ath9k/gpio.c
 +++ b/drivers/net/wireless/ath/ath9k/gpio.c
-@@ -139,10 +139,12 @@ void ath_init_leds(struct ath_softc *sc)
+@@ -44,12 +44,14 @@ void ath_init_leds(struct ath_softc *sc)
        if (AR_SREV_9100(sc->sc_ah))
                return;
  
 -      if (AR_SREV_9287(sc->sc_ah))
 -              sc->sc_ah->led_pin = ATH_LED_PIN_9287;
+-      else if (AR_SREV_9485(sc->sc_ah))
+-              sc->sc_ah->led_pin = ATH_LED_PIN_9485;
 -      else
 -              sc->sc_ah->led_pin = ATH_LED_PIN_DEF;
 +      if (sc->sc_ah->led_pin < 0) {
 +              if (AR_SREV_9287(sc->sc_ah))
 +                      sc->sc_ah->led_pin = ATH_LED_PIN_9287;
++              else if (AR_SREV_9485(sc->sc_ah))
++                      sc->sc_ah->led_pin = ATH_LED_PIN_9485;
 +              else
 +                      sc->sc_ah->led_pin = ATH_LED_PIN_DEF;
 +      }