diff options
| author | Felix Fietkau <nbd@nbd.name> | 2016-05-14 17:38:56 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2016-05-15 20:55:39 +0200 |
| commit | df93d53a4b7a5ce284dc0c6509057979f233cb92 (patch) | |
| tree | d99034d6d05295b9e27648dcbcf743b51c8a0c5b /package/kernel/mac80211/patches/546-ath9k_platform_led_name.patch | |
| parent | ace946152dd0806b25bcb3812b33ab5df95966b7 (diff) | |
| download | master-31e0f0ae-df93d53a4b7a5ce284dc0c6509057979f233cb92.tar.gz master-31e0f0ae-df93d53a4b7a5ce284dc0c6509057979f233cb92.tar.bz2 master-31e0f0ae-df93d53a4b7a5ce284dc0c6509057979f233cb92.zip | |
mac80211: update to wireless-testing 2016-05-12
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/kernel/mac80211/patches/546-ath9k_platform_led_name.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/546-ath9k_platform_led_name.patch | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/package/kernel/mac80211/patches/546-ath9k_platform_led_name.patch b/package/kernel/mac80211/patches/546-ath9k_platform_led_name.patch index 8d2d899112..ced72c6c69 100644 --- a/package/kernel/mac80211/patches/546-ath9k_platform_led_name.patch +++ b/package/kernel/mac80211/patches/546-ath9k_platform_led_name.patch @@ -13,9 +13,9 @@ Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl> --- a/drivers/net/wireless/ath/ath9k/gpio.c +++ b/drivers/net/wireless/ath/ath9k/gpio.c -@@ -132,15 +132,19 @@ void ath_init_leds(struct ath_softc *sc) - if (AR_SREV_9100(sc->sc_ah)) - return; +@@ -155,8 +155,11 @@ void ath_init_leds(struct ath_softc *sc) + + ath_fill_led_pin(sc); - snprintf(led_name, sizeof(led_name), "ath9k-%s", - wiphy_name(sc->hw->wiphy)); @@ -23,22 +23,13 @@ Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl> + strncpy(led_name, pdata->led_name, sizeof(led_name)); + else + snprintf(led_name, sizeof(led_name), "ath9k-%s", -+ wiphy_name(sc->hw->wiphy)); ++ wiphy_name(sc->hw->wiphy)); if (ath9k_led_blink) trigger = sc->led_default_trigger; - else - trigger = ieee80211_get_radio_led_name(sc->hw); - -- ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger, !sc->sc_ah->config.led_active_high); -+ ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger, -+ !sc->sc_ah->config.led_active_high); - - if (!pdata) - return; --- a/include/linux/ath9k_platform.h +++ b/include/linux/ath9k_platform.h -@@ -45,6 +45,7 @@ struct ath9k_platform_data { +@@ -49,6 +49,7 @@ struct ath9k_platform_data { int num_leds; const struct gpio_led *leds; |