aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/930-ath10k_add_tpt_led_trigger.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-06-17 14:12:44 +0200
committerFelix Fietkau <nbd@nbd.name>2016-06-17 14:12:44 +0200
commit4bab4dee84266fd1550cfdee25ee0ed7d7a62e78 (patch)
tree3cc89feae9d0ef5ca02c7f8844dbdf145aa27169 /package/kernel/mac80211/patches/930-ath10k_add_tpt_led_trigger.patch
parentc2e0c41842895ba47819fa98b785c76a2524628b (diff)
downloadupstream-4bab4dee84266fd1550cfdee25ee0ed7d7a62e78.tar.gz
upstream-4bab4dee84266fd1550cfdee25ee0ed7d7a62e78.tar.bz2
upstream-4bab4dee84266fd1550cfdee25ee0ed7d7a62e78.zip
ath10k: merge some more pending upstream fixes
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/kernel/mac80211/patches/930-ath10k_add_tpt_led_trigger.patch')
-rw-r--r--package/kernel/mac80211/patches/930-ath10k_add_tpt_led_trigger.patch4
1 files changed, 2 insertions, 2 deletions
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 92ed7a0d9a..1bfded01b0 100644
--- 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
-@@ -7716,6 +7716,21 @@ struct ath10k_vif *ath10k_get_arvif(stru
+@@ -7717,6 +7717,21 @@ struct ath10k_vif *ath10k_get_arvif(stru
return arvif_iter.arvif;
}
@@ -22,7 +22,7 @@
int ath10k_mac_register(struct ath10k *ar)
{
static const u32 cipher_suites[] = {
-@@ -7940,6 +7955,12 @@ int ath10k_mac_register(struct ath10k *a
+@@ -7941,6 +7956,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);