diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2019-07-07 13:48:20 +0200 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2019-07-18 00:22:04 +0200 |
| commit | bc5b2bcd9c73adbfc8cb8e7389a1a0fc18123f13 (patch) | |
| tree | 2e82d40952b6a953db3d5831e5107f56c6cfa106 /package/kernel/ath10k-ct/patches/202-ath10k-4.16-use-tpt-trigger-by-default.patch | |
| parent | 10fe5ca3629c4739763df0274610b43eebd1ee3a (diff) | |
| download | upstream-bc5b2bcd9c73adbfc8cb8e7389a1a0fc18123f13.tar.gz upstream-bc5b2bcd9c73adbfc8cb8e7389a1a0fc18123f13.tar.bz2 upstream-bc5b2bcd9c73adbfc8cb8e7389a1a0fc18123f13.zip | |
ath10k-ct: switch to version 5.2
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package/kernel/ath10k-ct/patches/202-ath10k-4.16-use-tpt-trigger-by-default.patch')
| -rw-r--r-- | package/kernel/ath10k-ct/patches/202-ath10k-4.16-use-tpt-trigger-by-default.patch | 37 |
1 files changed, 37 insertions, 0 deletions
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 9fe4c3b860..ead46b9b61 100644 --- 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 @@ -51,3 +51,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.2/core.h ++++ b/ath10k-5.2/core.h +@@ -1538,6 +1538,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.2/leds.c ++++ b/ath10k-5.2/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.2/mac.c ++++ b/ath10k-5.2/mac.c +@@ -10163,7 +10163,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 |