mac80211: backport upstream fixes for FragAttacks

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

diff --git a/package/kernel/mac80211/patches/ath/975-ath10k-use-tpt-trigger-by-default.patch b/package/kernel/mac80211/patches/ath/975-ath10k-use-tpt-trigger-by-default.patch
index 80db9ec437861026f3b558c4bdbabd3101548ef2..6da7bfa725f95a8671523d6812903ac249454ba8 100644 (file)
--- a/package/kernel/mac80211/patches/ath/975-ath10k-use-tpt-trigger-by-default.patch
+++ b/package/kernel/mac80211/patches/ath/975-ath10k-use-tpt-trigger-by-default.patch
@@ -16,16 +16,16 @@ Signed-off-by: Mathias Kresin <dev@kresin.me>
 
 --- 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;
+@@ -1290,6 +1290,10 @@ struct ath10k {
+       bool coex_support;
+       int coex_gpio_pin;
  
 +#ifdef CPTCFG_MAC80211_LEDS
 +      const char *led_default_trigger;
 +#endif
 +
        /* must be last */
-       u8 drv_priv[0] __aligned(sizeof(void *));
+       u8 drv_priv[] __aligned(sizeof(void *));
  };
 --- a/drivers/net/wireless/ath/ath10k/leds.c
 +++ b/drivers/net/wireless/ath/ath10k/leds.c
@@ -42,8 +42,8 @@ Signed-off-by: Mathias Kresin <dev@kresin.me>
        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);
+@@ -10074,7 +10074,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,