scottk/wlan-ap
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-ap.git synced 2025-10-30 18:07:52 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

mac80211-qca: properly rebase a patch

Browse Source 
The patch had a line skew due to a bad rebase.

Fixes: WIFI-7570
Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2022-05-29 17:37:35 +02:00
parent 7f81ddb8cc
commit a64039db20
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
feeds/wifi-ax/mac80211/patches/qca/342-ath11k-retain-debugfs-during-firmware-recovery.patch
View File

@@ -319,12 +319,10 @@ Index: backports-20210222_001-4.4.60-b157d2276/drivers/net/wireless/ath/ath11k/m
switch (vif->type) { switch (vif->type) {
case NL80211_IFTYPE_UNSPECIFIED: case NL80211_IFTYPE_UNSPECIFIED:
@@ -7176,8 +7180,13 @@ static int ath11k_mac_op_ampdu_action(st @@ -6946,6 +6950,14 @@ static int ath11k_mac_op_add_interface(s
break; 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) { + if (ar->state != ATH11K_STATE_RESTARTED) {
+ ath11k_debug_aggr_size_config_init(arvif); + ath11k_debug_aggr_size_config_init(arvif);
+ ath11k_debugfs_wmi_ctrl_stats(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_LIST_HEAD(&arvif->ar->debug.wmi_list);
+ init_completion(&arvif->ar->debug.wmi_ctrl_path_stats_rcvd); + init_completion(&arvif->ar->debug.wmi_ctrl_path_stats_rcvd);
+ } + }
+
mutex_unlock(&ar->conf_mutex); 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 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 --- backports-20210222_001-4.4.60-b157d2276.orig/drivers/net/wireless/ath/ath11k/debug_nss.c