| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106 |
- From: Matthias Schiffer <mschiffer@universe-factory.net>
- Date: Tue, 15 Aug 2017 04:08:08 +0200
- Subject: Revert "ath9k: drop obsolete patch"
- This reverts commit 4a4c00e7c4bd3c752fdfecb2c10dc16277e63856.
- diff --git a/package/kernel/mac80211/patches/546-ath9k_platform_led_name.patch b/package/kernel/mac80211/patches/546-ath9k_platform_led_name.patch
- new file mode 100644
- index 0000000000000000000000000000000000000000..ddb3fe60e8535b2d547f9b05ecb956d6a5b2b904
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/546-ath9k_platform_led_name.patch
- @@ -0,0 +1,39 @@
- +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 31dac29ad77b89626d300d9a82ba3bd2cc2210a1..86917eb6eeb18c9fb56d1cb7ec565ad1aef5c277 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)
- -@@ -180,6 +324,7 @@ void ath_init_leds(struct ath_softc *sc)
- +@@ -183,6 +327,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 f3fead0a1aef41e05957fda39128b13eaebb9652..4e165dde99938d3436b6497b8c2b08491c74f601 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
- -@@ -49,6 +49,10 @@ struct ath9k_platform_data {
- -
- +@@ -50,6 +50,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 bcb0026a69afdc52b3bf5ba074418435b343d1be..45284c71eed616bcaa5c875e85c209fbefc738a5 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
- -@@ -53,6 +53,8 @@ struct ath9k_platform_data {
- +@@ -54,6 +54,8 @@ struct ath9k_platform_data {
- unsigned num_btns;
- const struct gpio_keys_button *btns;
- unsigned btn_poll_interval;
- diff --git a/target/linux/generic/files/include/linux/ath9k_platform.h b/target/linux/generic/files/include/linux/ath9k_platform.h
- index f1f2ad419c752fc4a6a07c6b7fe366bf0ae8e38f..558445ff63a0f7f7bfff35286c39f89e243156de 100644
- --- a/target/linux/generic/files/include/linux/ath9k_platform.h
- +++ b/target/linux/generic/files/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;
-
- unsigned num_btns;
- const struct gpio_keys_button *btns;
|
