[][MAC80211][misc][Fix mt7986 build fail on backport v6.1]
[Description]
Fix mt7986 build fail on backport v6.1
Update mt7915/mt7986/mt7915 gloden fimware
[Release-log]
N/A
Change-Id: Ic5c2247e206cb5221e5472421831b136887b7e9c
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/6930574
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/911-mac80211-mtk-fix-the-issue-of-AP-and-STA-starting-on.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/911-mac80211-mtk-fix-the-issue-of-AP-and-STA-starting-on.patch
index 1199df9..b089f6a 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/911-mac80211-mtk-fix-the-issue-of-AP-and-STA-starting-on.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/911-mac80211-mtk-fix-the-issue-of-AP-and-STA-starting-on.patch
@@ -1,7 +1,7 @@
-From c3fa5e627f8c552852ee25ab366b4035c203aab3 Mon Sep 17 00:00:00 2001
+From 7aebd936d9c3b2f1d1bbd2d9e9996b67fde989a1 Mon Sep 17 00:00:00 2001
From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
Date: Wed, 5 Oct 2022 19:13:43 +0800
-Subject: [PATCH 911/911] mac80211: mtk: fix the issue of AP and STA starting
+Subject: [PATCH 911/915] mac80211: mtk: fix the issue of AP and STA starting
on DFS channel concurrently
Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
@@ -76,10 +76,10 @@
NUM_NL80211_ATTR = __NL80211_ATTR_AFTER_LAST,
NL80211_ATTR_MAX = __NL80211_ATTR_AFTER_LAST - 1
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
-index 97c5e5d..d726410 100644
+index 0a6257d..a7b6284 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
-@@ -4522,6 +4522,49 @@ ieee80211_skip_cac(struct wireless_dev *wdev)
+@@ -4519,6 +4519,49 @@ ieee80211_skip_cac(struct wireless_dev *wdev)
}
}
@@ -129,7 +129,7 @@
const struct cfg80211_ops mac80211_config_ops = {
.add_virtual_intf = ieee80211_add_iface,
.del_virtual_intf = ieee80211_del_iface,
-@@ -4629,4 +4672,5 @@ const struct cfg80211_ops mac80211_config_ops = {
+@@ -4626,4 +4669,5 @@ const struct cfg80211_ops mac80211_config_ops = {
.color_change = ieee80211_color_change,
.set_radar_background = ieee80211_set_radar_background,
.skip_cac = ieee80211_skip_cac,