ath10k-ct: Use ath10k-ct version 5.4

[openwrt/openwrt.git] / package / kernel / ath10k-ct / patches / 202-ath10k-4.16-use-tpt-trigger-by-default.patch

diff --git a/package/kernel/ath10k-ct/patches/202-ath10k-4.16-use-tpt-trigger-by-default.patch b/package/kernel/ath10k-ct/patches/202-ath10k-4.16-use-tpt-trigger-by-default.patch
index 1b6fd51acb242b7427da6d6a249ba5dac98a4d54..c23c31417bfe5182419ca268f312e7ff94f8e5da 100644 (file)
--- a/package/kernel/ath10k-ct/patches/202-ath10k-4.16-use-tpt-trigger-by-default.patch
+++ b/package/kernel/ath10k-ct/patches/202-ath10k-4.16-use-tpt-trigger-by-default.patch
@@ -88,3 +88,40 @@ Signed-off-by: Mathias Kresin <dev@kresin.me>
                IEEE80211_TPT_LEDTRIG_FL_RADIO, ath10k_tpt_blink,
                ARRAY_SIZE(ath10k_tpt_blink));
  #endif
+--- a/ath10k-5.4/core.h
++++ b/ath10k-5.4/core.h
+@@ -1573,6 +1573,10 @@ struct ath10k {
+       u8 csi_data[4096];
+       u16 csi_data_len;
+ 
++#ifdef CPTCFG_MAC80211_LEDS
++      const char *led_default_trigger;
++#endif
++
+       /* must be last */
+       u8 drv_priv[0] __aligned(sizeof(void *));
+ };
+--- a/ath10k-5.4/leds.c
++++ b/ath10k-5.4/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/ath10k-5.4/mac.c
++++ b/ath10k-5.4/mac.c
+@@ -10367,7 +10367,7 @@ int ath10k_mac_register(struct ath10k *a
+       ar->hw->weight_multiplier = ATH10K_AIRTIME_WEIGHT_MULTIPLIER;
+ 
+ #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