From a64039db205f4bb34c3e2963b922096fb875e420 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sun, 29 May 2022 17:37:35 +0200 Subject: [PATCH] mac80211-qca: properly rebase a patch The patch had a line skew due to a bad rebase. Fixes: WIFI-7570 Signed-off-by: John Crispin --- ...ain-debugfs-during-firmware-recovery.patch | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/feeds/wifi-ax/mac80211/patches/qca/342-ath11k-retain-debugfs-during-firmware-recovery.patch b/feeds/wifi-ax/mac80211/patches/qca/342-ath11k-retain-debugfs-during-firmware-recovery.patch index 4b4b01fba..9514e52b7 100644 --- a/feeds/wifi-ax/mac80211/patches/qca/342-ath11k-retain-debugfs-during-firmware-recovery.patch +++ b/feeds/wifi-ax/mac80211/patches/qca/342-ath11k-retain-debugfs-during-firmware-recovery.patch @@ -319,12 +319,10 @@ Index: backports-20210222_001-4.4.60-b157d2276/drivers/net/wireless/ath/ath11k/m switch (vif->type) { case NL80211_IFTYPE_UNSPECIFIED: -@@ -7176,8 +7180,13 @@ static int ath11k_mac_op_ampdu_action(st - break; - } +@@ -6946,6 +6950,14 @@ static int ath11k_mac_op_add_interface(s + if (vif->type != NL80211_IFTYPE_MONITOR && ar->monitor_conf_enabled) + ath11k_mac_monitor_vdev_create(ar); -- ath11k_debug_aggr_size_config_init(arvif); -- ath11k_debugfs_wmi_ctrl_stats(arvif); + if (ar->state != ATH11K_STATE_RESTARTED) { + ath11k_debug_aggr_size_config_init(arvif); + ath11k_debugfs_wmi_ctrl_stats(arvif); @@ -332,9 +330,20 @@ Index: backports-20210222_001-4.4.60-b157d2276/drivers/net/wireless/ath/ath11k/m + INIT_LIST_HEAD(&arvif->ar->debug.wmi_list); + init_completion(&arvif->ar->debug.wmi_ctrl_path_stats_rcvd); + } - ++ mutex_unlock(&ar->conf_mutex); + return ret; +@@ -7176,9 +7188,6 @@ static int ath11k_mac_op_ampdu_action(st + break; + } + +- ath11k_debug_aggr_size_config_init(arvif); +- ath11k_debugfs_wmi_ctrl_stats(arvif); +- + mutex_unlock(&ar->conf_mutex); + + return ret; Index: backports-20210222_001-4.4.60-b157d2276/drivers/net/wireless/ath/ath11k/debug_nss.c =================================================================== --- backports-20210222_001-4.4.60-b157d2276.orig/drivers/net/wireless/ath/ath11k/debug_nss.c