diff options
| author | Mathias Kresin <dev@kresin.me> | 2017-03-25 11:48:02 +0100 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2017-04-08 14:30:00 +0200 |
| commit | 4a4c00e7c4bd3c752fdfecb2c10dc16277e63856 (patch) | |
| tree | 452a8384835208710b89eda175e37885c4fa818e /package/kernel/mac80211 | |
| parent | 1f5ea4eae46e46a87353a751637ccb5d5cd5f60b (diff) | |
| download | upstream-4a4c00e7c4bd3c752fdfecb2c10dc16277e63856.tar.gz upstream-4a4c00e7c4bd3c752fdfecb2c10dc16277e63856.tar.bz2 upstream-4a4c00e7c4bd3c752fdfecb2c10dc16277e63856.zip | |
ath9k: drop obsolete patch
Now that the wireless LEDs are added via platform leds this patch isn't
required any longer.
Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'package/kernel/mac80211')
4 files changed, 4 insertions, 43 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 deleted file mode 100644 index ddb3fe60e8..0000000000 --- a/package/kernel/mac80211/patches/546-ath9k_platform_led_name.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl> -Date: Sun, 31 Jan 2016 20:45:57 +0100 -Subject: [PATCH v4 1/8] mac80211: ath9k: enable platform WLAN LED name - -Enable platform-supplied WLAN LED name for ath9k device. It replaces generic -'ath9k-phy*' label with string set during platform initialization. - -Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl> ---- - drivers/net/wireless/ath/ath9k/gpio.c | 7 +++++-- - include/linux/ath9k_platform.h | 1 + - 2 files changed, 6 insertions(+), 2 deletions(-) - ---- a/drivers/net/wireless/ath/ath9k/gpio.c -+++ b/drivers/net/wireless/ath/ath9k/gpio.c -@@ -166,8 +166,11 @@ void ath_init_leds(struct ath_softc *sc) - if (sc->sc_ah->led_pin < 0) - return; - -- snprintf(led_name, sizeof(led_name), "ath9k-%s", -- wiphy_name(sc->hw->wiphy)); -+ if (pdata && pdata->led_name) -+ strncpy(led_name, pdata->led_name, sizeof(led_name)); -+ else -+ snprintf(led_name, sizeof(led_name), "ath9k-%s", -+ wiphy_name(sc->hw->wiphy)); - - if (ath9k_led_blink) - trigger = sc->led_default_trigger; ---- a/include/linux/ath9k_platform.h -+++ b/include/linux/ath9k_platform.h -@@ -49,6 +49,7 @@ struct ath9k_platform_data { - - int num_leds; - const struct gpio_led *leds; -+ const char *led_name; - }; - - #endif /* _LINUX_ATH9K_PLATFORM_H */ diff --git a/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch b/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch index 86917eb6ee..31dac29ad7 100644 --- a/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch +++ b/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch @@ -237,7 +237,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> ath_fill_led_pin(sc); if (pdata && pdata->leds && pdata->num_leds) -@@ -183,6 +327,7 @@ void ath_init_leds(struct ath_softc *sc) +@@ -180,6 +324,7 @@ void ath_init_leds(struct ath_softc *sc) ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger, !sc->sc_ah->config.led_active_high); } diff --git a/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch b/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch index 4e165dde99..f3fead0a1a 100644 --- a/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch +++ b/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch @@ -127,10 +127,10 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> for (i = 0; i < pdata->num_leds; i++) { --- a/include/linux/ath9k_platform.h +++ b/include/linux/ath9k_platform.h -@@ -50,6 +50,10 @@ struct ath9k_platform_data { +@@ -49,6 +49,10 @@ struct ath9k_platform_data { + int num_leds; const struct gpio_led *leds; - const char *led_name; + + unsigned num_btns; + const struct gpio_keys_button *btns; diff --git a/package/kernel/mac80211/patches/551-ath9k_ubnt_uap_plus_hsr.patch b/package/kernel/mac80211/patches/551-ath9k_ubnt_uap_plus_hsr.patch index 45284c71ee..bcb0026a69 100644 --- a/package/kernel/mac80211/patches/551-ath9k_ubnt_uap_plus_hsr.patch +++ b/package/kernel/mac80211/patches/551-ath9k_ubnt_uap_plus_hsr.patch @@ -375,7 +375,7 @@ --- a/include/linux/ath9k_platform.h +++ b/include/linux/ath9k_platform.h -@@ -54,6 +54,8 @@ struct ath9k_platform_data { +@@ -53,6 +53,8 @@ struct ath9k_platform_data { unsigned num_btns; const struct gpio_keys_button *btns; unsigned btn_poll_interval; |