mac80211: backport brcmfmac changes from 2016-07-08

[openwrt/staging/chunkeey.git] / package / kernel / mac80211 / patches / 930-ath10k_add_tpt_led_trigger.patch

diff --git a/package/kernel/mac80211/patches/930-ath10k_add_tpt_led_trigger.patch b/package/kernel/mac80211/patches/930-ath10k_add_tpt_led_trigger.patch
index 150e00856093fd20586af42d3c3dbde4fa93b25b..83ca0296977171f126b14736c35e489398b67d72 100644 (file)
--- a/package/kernel/mac80211/patches/930-ath10k_add_tpt_led_trigger.patch
+++ b/package/kernel/mac80211/patches/930-ath10k_add_tpt_led_trigger.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath10k/mac.c
 +++ b/drivers/net/wireless/ath/ath10k/mac.c
-@@ -4824,6 +4824,21 @@ struct ath10k_vif *ath10k_get_arvif(stru
+@@ -7742,6 +7742,21 @@ struct ath10k_vif *ath10k_get_arvif(stru
        return arvif_iter.arvif;
  }
  
@@ -21,10 +21,10 @@
 +
  int ath10k_mac_register(struct ath10k *ar)
  {
-       struct ieee80211_supported_band *band;
-@@ -4965,6 +4980,12 @@ int ath10k_mac_register(struct ath10k *a
-               goto err_free;
-       }
+       static const u32 cipher_suites[] = {
+@@ -7975,6 +7990,12 @@ int ath10k_mac_register(struct ath10k *a
+       ar->hw->wiphy->cipher_suites = cipher_suites;
+       ar->hw->wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites);
  
 +#if CPTCFG_MAC80211_LEDS
 +      ieee80211_create_tpt_led_trigger(ar->hw,