mac80211: rebase ontop of v4.18-rc7

[openwrt/staging/blogic.git] / package / kernel / mac80211 / patches / 975-ath10k-use-tpt-trigger-by-default.patch

diff --git a/package/kernel/mac80211/patches/975-ath10k-use-tpt-trigger-by-default.patch b/package/kernel/mac80211/patches/975-ath10k-use-tpt-trigger-by-default.patch
deleted file mode 100644 (file)
index 80db9ec..0000000
--- a/package/kernel/mac80211/patches/975-ath10k-use-tpt-trigger-by-default.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 79c9d7aabae1d1da9eea97d83b61e1517a8a2221 Mon Sep 17 00:00:00 2001
-From: Mathias Kresin <dev@kresin.me>
-Date: Fri, 22 Jun 2018 18:59:44 +0200
-Subject: [PATCH] ath10k: use tpt LED trigger by default
-
-Use the tpt LED trigger for each created phy led. Ths way LEDs attached
-to the ath10k GPIO pins are indicating the phy status and blink on
-traffic.
-
-Signed-off-by: Mathias Kresin <dev@kresin.me>
----
- drivers/net/wireless/ath/ath10k/core.h | 4 ++++
- drivers/net/wireless/ath/ath10k/leds.c | 4 +---
- drivers/net/wireless/ath/ath10k/mac.c  | 2 +-
- 3 files changed, 6 insertions(+), 4 deletions(-)
-
---- a/drivers/net/wireless/ath/ath10k/core.h
-+++ b/drivers/net/wireless/ath/ath10k/core.h
-@@ -1055,6 +1055,10 @@ struct ath10k {
-       struct ath10k_radar_found_info last_radar_info;
-       struct work_struct radar_confirmation_work;
- 
-+#ifdef CPTCFG_MAC80211_LEDS
-+      const char *led_default_trigger;
-+#endif
-+
-       /* must be last */
-       u8 drv_priv[0] __aligned(sizeof(void *));
- };
---- a/drivers/net/wireless/ath/ath10k/leds.c
-+++ b/drivers/net/wireless/ath/ath10k/leds.c
-@@ -81,9 +81,7 @@ int ath10k_leds_register(struct ath10k *
- 
-       ar->leds.cdev.name = ar->leds.label;
-       ar->leds.cdev.brightness_set_blocking = ath10k_leds_set_brightness_blocking;
--
--      /* FIXME: this assignment doesn't make sense as it's NULL, remove it? */
--      ar->leds.cdev.default_trigger = ar->leds.wifi_led.default_trigger;
-+      ar->leds.cdev.default_trigger = ar->led_default_trigger;
- 
-       ret = led_classdev_register(wiphy_dev(ar->hw->wiphy), &ar->leds.cdev);
-       if (ret)
---- a/drivers/net/wireless/ath/ath10k/mac.c
-+++ b/drivers/net/wireless/ath/ath10k/mac.c
-@@ -8429,7 +8429,7 @@ int ath10k_mac_register(struct ath10k *a
-       wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);
- 
- #ifdef CPTCFG_MAC80211_LEDS
--      ieee80211_create_tpt_led_trigger(ar->hw,
-+      ar->led_default_trigger = ieee80211_create_tpt_led_trigger(ar->hw,
-               IEEE80211_TPT_LEDTRIG_FL_RADIO, ath10k_tpt_blink,
-               ARRAY_SIZE(ath10k_tpt_blink));
- #endif