[openwrt/openwrt] ath10k-ct: fix mac80211 backport patch to account for the bump to 6.7

LEDE Commits lede-commits at lists.infradead.org
Fri Jul 12 09:27:40 PDT 2024


nbd pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/7ca4190c186b6018f66421ce04daed5deeefdabb

commit 7ca4190c186b6018f66421ce04daed5deeefdabb
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Fri Jul 12 18:26:56 2024 +0200

    ath10k-ct: fix mac80211 backport patch to account for the bump to 6.7
    
    Fixes build error
    
    Fixes: 1bfcc1ea8a78 ("mac80211: update to version 6.9.9")
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 .../kernel/ath10k-ct/patches/010-mac80211_backport.patch   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/package/kernel/ath10k-ct/patches/010-mac80211_backport.patch b/package/kernel/ath10k-ct/patches/010-mac80211_backport.patch
index b3f7d580fa..6c9cfdf730 100644
--- a/package/kernel/ath10k-ct/patches/010-mac80211_backport.patch
+++ b/package/kernel/ath10k-ct/patches/010-mac80211_backport.patch
@@ -1,6 +1,6 @@
---- a/ath10k-6.4/mac.c
-+++ b/ath10k-6.4/mac.c
-@@ -2310,8 +2310,8 @@ static void ath10k_mac_vif_ap_csa_count_
+--- a/ath10k-6.7/mac.c
++++ b/ath10k-6.7/mac.c
+@@ -2304,8 +2304,8 @@ static void ath10k_mac_vif_ap_csa_count_
  	if (!arvif->is_up)
  		return;
  
@@ -11,7 +11,7 @@
  
  		ret = ath10k_mac_setup_bcn_tmpl(arvif);
  		if (ret)
-@@ -2323,7 +2323,7 @@ static void ath10k_mac_vif_ap_csa_count_
+@@ -2317,7 +2317,7 @@ static void ath10k_mac_vif_ap_csa_count_
  			ath10k_warn(ar, "failed to update prb tmpl during csa: %d\n",
  				    ret);
  	} else {
@@ -20,9 +20,9 @@
  	}
  }
  
---- a/ath10k-6.4/wmi.c
-+++ b/ath10k-6.4/wmi.c
-@@ -4284,8 +4284,8 @@ void ath10k_wmi_event_host_swba(struct a
+--- a/ath10k-6.7/wmi.c
++++ b/ath10k-6.7/wmi.c
+@@ -4292,8 +4292,8 @@ void ath10k_wmi_event_host_swba(struct a
  		 * actual channel switch is done
  		 */
  		if (arvif->vif->bss_conf.csa_active &&




More information about the lede-commits mailing list