[][MAC80211][core][refine backports patches]
[Description]
Refactor backports patches and apply new naming rule.
[Release-log]
N/A
Change-Id: I04fb82509f18341989ce381ad1f1e53f5ec2d4ee
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/7135679
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211/package/kernel/mac80211/patches/subsys/9999902-mac80211-mtk-add-EHT-BA1024-support.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211/package/kernel/mac80211/patches/subsys/mtk-0100-mac80211-mtk-add-EHT-BA1024-support.patch
similarity index 95%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211/package/kernel/mac80211/patches/subsys/9999902-mac80211-mtk-add-EHT-BA1024-support.patch
rename to autobuild_mac80211_release/mt7988_mt7996_mac80211/package/kernel/mac80211/patches/subsys/mtk-0100-mac80211-mtk-add-EHT-BA1024-support.patch
index 76dd9ef..237bc45 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211/package/kernel/mac80211/patches/subsys/9999902-mac80211-mtk-add-EHT-BA1024-support.patch
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211/package/kernel/mac80211/patches/subsys/mtk-0100-mac80211-mtk-add-EHT-BA1024-support.patch
@@ -1,7 +1,7 @@
-From 85dde30ef0509def7bfec494aef7e5395e656c50 Mon Sep 17 00:00:00 2001
-From: Evelyn Tsai <evelyn.tsai@mediatek.com>
+From b068bbf279658acaef1bef11e6a7052948eb1ef0 Mon Sep 17 00:00:00 2001
+From: MeiChia Chiu <meichia.chiu@mediatek.com>
Date: Sun, 25 Dec 2022 22:43:46 +0800
-Subject: [PATCH 9999902/9999902] mac80211: mtk: add EHT BA1024 support
+Subject: [PATCH 100/101] mac80211: mtk: add EHT BA1024 support
---
include/linux/ieee80211.h | 2 ++
@@ -110,5 +110,5 @@
txq = sta->sta.txq[tid];
--
-2.18.0
+2.25.1
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211/package/kernel/mac80211/patches/subsys/9999901-mac80211-mtk-add-rate-duration-for-EHT-rate.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211/package/kernel/mac80211/patches/subsys/mtk-0101-mac80211-mtk-add-rate-duration-for-EHT-rate.patch
similarity index 94%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211/package/kernel/mac80211/patches/subsys/9999901-mac80211-mtk-add-rate-duration-for-EHT-rate.patch
rename to autobuild_mac80211_release/mt7988_mt7996_mac80211/package/kernel/mac80211/patches/subsys/mtk-0101-mac80211-mtk-add-rate-duration-for-EHT-rate.patch
index 0675c5e..bedbd70 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211/package/kernel/mac80211/patches/subsys/9999901-mac80211-mtk-add-rate-duration-for-EHT-rate.patch
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211/package/kernel/mac80211/patches/subsys/mtk-0101-mac80211-mtk-add-rate-duration-for-EHT-rate.patch
@@ -1,36 +1,12 @@
-From 06ae5e66a56e6def22c1d4d61d75815f9b1f7ee2 Mon Sep 17 00:00:00 2001
-From: Evelyn Tsai <evelyn.tsai@mediatek.com>
+From 91dc0a129c141c018097e5cae0e3e0ae5ff44b41 Mon Sep 17 00:00:00 2001
+From: Bo Jiao <Bo.Jiao@mediatek.com>
Date: Sun, 25 Dec 2022 22:43:46 +0800
-Subject: [PATCH 9999901/9999902] mac80211: mtk: add rate duration for EHT
- rate.
+Subject: [PATCH 101/101] mac80211: mtk: add rate duration for EHT rate.
---
- include/net/mac80211.h | 4 +-
net/mac80211/airtime.c | 349 ++++++++++++++++++++++++++++++++++++++++-
- 2 files changed, 348 insertions(+), 5 deletions(-)
+ 1 file changed, 346 insertions(+), 3 deletions(-)
-diff --git a/include/net/mac80211.h b/include/net/mac80211.h
-index dd9e834..f7fcefe 100644
---- a/include/net/mac80211.h
-+++ b/include/net/mac80211.h
-@@ -1437,6 +1437,7 @@ enum mac80211_rx_encoding {
- RX_ENC_HT,
- RX_ENC_VHT,
- RX_ENC_HE,
-+ RX_ENC_EHT,
- };
-
- /**
-@@ -1499,8 +1500,7 @@ struct ieee80211_rx_status {
- u32 flag;
- u16 freq: 13, freq_offset: 1;
- u8 enc_flags;
-- u8 encoding:2, bw:3, he_ru:3;
-- u8 he_gi:2, he_dcm:1;
-+ u16 encoding:3, bw:3, he_ru:3, he_gi:2, he_dcm:1;
- u8 rate_idx;
- u8 nss;
- u8 rx_flags;
diff --git a/net/mac80211/airtime.c b/net/mac80211/airtime.c
index e8ebd34..b1de6d0 100644
--- a/net/mac80211/airtime.c
@@ -460,5 +436,5 @@
if (stat->encoding != RX_ENC_LEGACY)
return true;
--
-2.18.0
+2.25.1
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0001-mac80211-support-minimal-EHT-rate-reporting-on-RX.patch b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0001-mac80211-support-minimal-EHT-rate-reporting-on-RX.patch
new file mode 100644
index 0000000..7713b56
--- /dev/null
+++ b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0001-mac80211-support-minimal-EHT-rate-reporting-on-RX.patch
@@ -0,0 +1,192 @@
+From b330aac018d272206775f120e8793ad6d11d805c Mon Sep 17 00:00:00 2001
+From: Johannes Berg <johannes.berg@intel.com>
+Date: Mon, 9 Jan 2023 13:07:21 +0200
+Subject: [PATCH 01/16] mac80211: support minimal EHT rate reporting on RX
+
+Add minimal support for RX EHT rate reporting, not yet
+adding (modifying) any radiotap headers, just statistics
+for cfg80211.
+
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+---
+ include/net/mac80211.h | 19 ++++++++++++++++---
+ net/mac80211/rx.c | 9 +++++++++
+ net/mac80211/sta_info.c | 9 ++++++++-
+ net/mac80211/sta_info.h | 24 ++++++++++++++++++------
+ net/mac80211/util.c | 13 +++++++++++++
+ 5 files changed, 64 insertions(+), 10 deletions(-)
+
+diff --git a/include/net/mac80211.h b/include/net/mac80211.h
+index 6b16d6c..edc10ff 100644
+--- a/include/net/mac80211.h
++++ b/include/net/mac80211.h
+@@ -1436,6 +1436,7 @@ enum mac80211_rx_encoding {
+ RX_ENC_HT,
+ RX_ENC_VHT,
+ RX_ENC_HE,
++ RX_ENC_EHT,
+ };
+
+ /**
+@@ -1469,7 +1470,7 @@ enum mac80211_rx_encoding {
+ * @antenna: antenna used
+ * @rate_idx: index of data rate into band's supported rates or MCS index if
+ * HT or VHT is used (%RX_FLAG_HT/%RX_FLAG_VHT)
+- * @nss: number of streams (VHT and HE only)
++ * @nss: number of streams (VHT, HE and EHT only)
+ * @flag: %RX_FLAG_\*
+ * @encoding: &enum mac80211_rx_encoding
+ * @bw: &enum rate_info_bw
+@@ -1477,6 +1478,8 @@ enum mac80211_rx_encoding {
+ * @he_ru: HE RU, from &enum nl80211_he_ru_alloc
+ * @he_gi: HE GI, from &enum nl80211_he_gi
+ * @he_dcm: HE DCM value
++ * @eht.ru: EHT RU, from &enum nl80211_eht_ru_alloc
++ * @eht.gi: EHT GI, from &enum nl80211_eht_gi
+ * @rx_flags: internal RX flags for mac80211
+ * @ampdu_reference: A-MPDU reference number, must be a different value for
+ * each A-MPDU but the same for each subframe within one A-MPDU
+@@ -1498,8 +1501,18 @@ struct ieee80211_rx_status {
+ u32 flag;
+ u16 freq: 13, freq_offset: 1;
+ u8 enc_flags;
+- u8 encoding:2, bw:3, he_ru:3;
+- u8 he_gi:2, he_dcm:1;
++ u8 encoding:3, bw:4;
++ union {
++ struct {
++ u8 he_ru:3;
++ u8 he_gi:2;
++ u8 he_dcm:1;
++ };
++ struct {
++ u8 ru:4;
++ u8 gi:2;
++ } eht;
++ };
+ u8 rate_idx;
+ u8 nss;
+ u8 rx_flags;
+diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
+index 2a83cd8..cc11ac5 100644
+--- a/net/mac80211/rx.c
++++ b/net/mac80211/rx.c
+@@ -5209,6 +5209,15 @@ void ieee80211_rx_list(struct ieee80211_hw *hw, struct ieee80211_sta *pubsta,
+ status->rate_idx, status->nss))
+ goto drop;
+ break;
++ case RX_ENC_EHT:
++ if (WARN_ONCE(status->rate_idx > 15 ||
++ !status->nss ||
++ status->nss > 8 ||
++ status->eht.gi > NL80211_RATE_INFO_EHT_GI_3_2,
++ "Rate marked as an EHT rate but data is invalid: MCS:%d, NSS:%d, GI:%d\n",
++ status->rate_idx, status->nss, status->eht.gi))
++ goto drop;
++ break;
+ default:
+ WARN_ON_ONCE(1);
+ fallthrough;
+diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
+index 97d24e9..69b4b42 100644
+--- a/net/mac80211/sta_info.c
++++ b/net/mac80211/sta_info.c
+@@ -4,7 +4,7 @@
+ * Copyright 2006-2007 Jiri Benc <jbenc@suse.cz>
+ * Copyright 2013-2014 Intel Mobile Communications GmbH
+ * Copyright (C) 2015 - 2017 Intel Deutschland GmbH
+- * Copyright (C) 2018-2021 Intel Corporation
++ * Copyright (C) 2018-2022 Intel Corporation
+ */
+
+ #include <linux/module.h>
+@@ -2368,6 +2368,13 @@ static void sta_stats_decode_rate(struct ieee80211_local *local, u32 rate,
+ rinfo->he_ru_alloc = STA_STATS_GET(HE_RU, rate);
+ rinfo->he_dcm = STA_STATS_GET(HE_DCM, rate);
+ break;
++ case STA_STATS_RATE_TYPE_EHT:
++ rinfo->flags = RATE_INFO_FLAGS_EHT_MCS;
++ rinfo->mcs = STA_STATS_GET(EHT_MCS, rate);
++ rinfo->nss = STA_STATS_GET(EHT_NSS, rate);
++ rinfo->eht_gi = STA_STATS_GET(EHT_GI, rate);
++ rinfo->eht_ru_alloc = STA_STATS_GET(EHT_RU, rate);
++ break;
+ }
+ }
+
+diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
+index 8bd7ea3..a23e3c6 100644
+--- a/net/mac80211/sta_info.h
++++ b/net/mac80211/sta_info.h
+@@ -929,6 +929,7 @@ enum sta_stats_type {
+ STA_STATS_RATE_TYPE_VHT,
+ STA_STATS_RATE_TYPE_HE,
+ STA_STATS_RATE_TYPE_S1G,
++ STA_STATS_RATE_TYPE_EHT,
+ };
+
+ #define STA_STATS_FIELD_HT_MCS GENMASK( 7, 0)
+@@ -938,12 +939,16 @@ enum sta_stats_type {
+ #define STA_STATS_FIELD_VHT_NSS GENMASK( 7, 4)
+ #define STA_STATS_FIELD_HE_MCS GENMASK( 3, 0)
+ #define STA_STATS_FIELD_HE_NSS GENMASK( 7, 4)
+-#define STA_STATS_FIELD_BW GENMASK(11, 8)
+-#define STA_STATS_FIELD_SGI GENMASK(12, 12)
+-#define STA_STATS_FIELD_TYPE GENMASK(15, 13)
+-#define STA_STATS_FIELD_HE_RU GENMASK(18, 16)
+-#define STA_STATS_FIELD_HE_GI GENMASK(20, 19)
+-#define STA_STATS_FIELD_HE_DCM GENMASK(21, 21)
++#define STA_STATS_FIELD_EHT_MCS GENMASK( 3, 0)
++#define STA_STATS_FIELD_EHT_NSS GENMASK( 7, 4)
++#define STA_STATS_FIELD_BW GENMASK(12, 8)
++#define STA_STATS_FIELD_SGI GENMASK(13, 13)
++#define STA_STATS_FIELD_TYPE GENMASK(16, 14)
++#define STA_STATS_FIELD_HE_RU GENMASK(19, 17)
++#define STA_STATS_FIELD_HE_GI GENMASK(21, 20)
++#define STA_STATS_FIELD_HE_DCM GENMASK(22, 22)
++#define STA_STATS_FIELD_EHT_RU GENMASK(20, 17)
++#define STA_STATS_FIELD_EHT_GI GENMASK(22, 21)
+
+ #define STA_STATS_FIELD(_n, _v) FIELD_PREP(STA_STATS_FIELD_ ## _n, _v)
+ #define STA_STATS_GET(_n, _v) FIELD_GET(STA_STATS_FIELD_ ## _n, _v)
+@@ -982,6 +987,13 @@ static inline u32 sta_stats_encode_rate(struct ieee80211_rx_status *s)
+ r |= STA_STATS_FIELD(HE_RU, s->he_ru);
+ r |= STA_STATS_FIELD(HE_DCM, s->he_dcm);
+ break;
++ case RX_ENC_EHT:
++ r |= STA_STATS_FIELD(TYPE, STA_STATS_RATE_TYPE_EHT);
++ r |= STA_STATS_FIELD(EHT_NSS, s->nss);
++ r |= STA_STATS_FIELD(EHT_MCS, s->rate_idx);
++ r |= STA_STATS_FIELD(EHT_GI, s->eht.gi);
++ r |= STA_STATS_FIELD(EHT_RU, s->eht.ru);
++ break;
+ default:
+ WARN_ON(1);
+ return STA_STATS_RATE_INVALID;
+diff --git a/net/mac80211/util.c b/net/mac80211/util.c
+index 005a730..608f927 100644
+--- a/net/mac80211/util.c
++++ b/net/mac80211/util.c
+@@ -3926,6 +3926,19 @@ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local,
+
+ /* Fill cfg80211 rate info */
+ switch (status->encoding) {
++ case RX_ENC_EHT:
++ ri.flags |= RATE_INFO_FLAGS_EHT_MCS;
++ ri.mcs = status->rate_idx;
++ ri.nss = status->nss;
++ ri.eht_ru_alloc = status->eht.ru;
++ if (status->enc_flags & RX_ENC_FLAG_SHORT_GI)
++ ri.flags |= RATE_INFO_FLAGS_SHORT_GI;
++ /* TODO/FIXME: is this right? handle other PPDUs */
++ if (status->flag & RX_FLAG_MACTIME_PLCP_START) {
++ mpdu_offset += 2;
++ ts += 36;
++ }
++ break;
+ case RX_ENC_HE:
+ ri.flags |= RATE_INFO_FLAGS_HE_MCS;
+ ri.mcs = status->rate_idx;
+--
+2.25.1
+
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/900-mac80211-mtk-do-not-setup-twt-when-twt-responder-is-.patch b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0002-mac80211-mtk-do-not-setup-twt-when-twt-responder-is-.patch
similarity index 74%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/900-mac80211-mtk-do-not-setup-twt-when-twt-responder-is-.patch
rename to autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0002-mac80211-mtk-do-not-setup-twt-when-twt-responder-is-.patch
index d016f3c..466bda3 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/900-mac80211-mtk-do-not-setup-twt-when-twt-responder-is-.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0002-mac80211-mtk-do-not-setup-twt-when-twt-responder-is-.patch
@@ -1,7 +1,7 @@
-From 3cd276528e86211747f4628e8d37804facbba749 Mon Sep 17 00:00:00 2001
+From 3d53aa889d0ed418ac2743e98925f44a2efbf4e4 Mon Sep 17 00:00:00 2001
From: Peter Chiu <chui-hao.chiu@mediatek.com>
Date: Tue, 18 Jan 2022 20:29:44 +0800
-Subject: [PATCH 900/912] mac80211: mtk: do not setup twt when twt responder is
+Subject: [PATCH 02/15] mac80211: mtk: do not setup twt when twt responder is
false
---
@@ -9,7 +9,7 @@
1 file changed, 3 insertions(+)
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
-index ba21e7c..02a0387 100644
+index cc11ac5..9f2a13b 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -3298,6 +3298,9 @@ ieee80211_process_rx_twt_action(struct ieee80211_rx_data *rx)
@@ -23,5 +23,5 @@
return false;
--
-2.36.1
+2.25.1
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0002-wifi-mac80211-make-rate-u32-in-sta_set_rate_info_rx.patch b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0002-wifi-mac80211-make-rate-u32-in-sta_set_rate_info_rx.patch
new file mode 100644
index 0000000..b8580cf
--- /dev/null
+++ b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0002-wifi-mac80211-make-rate-u32-in-sta_set_rate_info_rx.patch
@@ -0,0 +1,30 @@
+From 1255bfdd67f8c795e26d2417f3d2e553cae8cbe6 Mon Sep 17 00:00:00 2001
+From: Shayne Chen <shayne.chen@mediatek.com>
+Date: Thu, 9 Feb 2023 18:58:08 +0800
+Subject: [PATCH 02/16] wifi: mac80211: make rate u32 in sta_set_rate_info_rx()
+
+The value of last_rate in ieee80211_sta_rx_stats is degraded from u32 to
+u16 after being assigned to rate variable, which causes information loss
+in STA_STATS_FIELD_TYPE and later bitfields.
+
+Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
+---
+ net/mac80211/sta_info.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
+index 69b4b42..ff2f057 100644
+--- a/net/mac80211/sta_info.c
++++ b/net/mac80211/sta_info.c
+@@ -2380,7 +2380,7 @@ static void sta_stats_decode_rate(struct ieee80211_local *local, u32 rate,
+
+ static int sta_set_rate_info_rx(struct sta_info *sta, struct rate_info *rinfo)
+ {
+- u16 rate = READ_ONCE(sta_get_last_rx_stats(sta)->last_rate);
++ u32 rate = READ_ONCE(sta_get_last_rx_stats(sta)->last_rate);
+
+ if (rate == STA_STATS_RATE_INVALID)
+ return -EINVAL;
+--
+2.25.1
+
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/900-mac80211-mtk-do-not-setup-twt-when-twt-responder-is-.patch b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0003-mac80211-mtk-do-not-setup-twt-when-twt-responder-is-.patch
similarity index 74%
copy from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/900-mac80211-mtk-do-not-setup-twt-when-twt-responder-is-.patch
copy to autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0003-mac80211-mtk-do-not-setup-twt-when-twt-responder-is-.patch
index d016f3c..dc41b6f 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/900-mac80211-mtk-do-not-setup-twt-when-twt-responder-is-.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0003-mac80211-mtk-do-not-setup-twt-when-twt-responder-is-.patch
@@ -1,7 +1,7 @@
-From 3cd276528e86211747f4628e8d37804facbba749 Mon Sep 17 00:00:00 2001
+From 988201fdd6bfbd04989d57cfc22c13274ad1ec9f Mon Sep 17 00:00:00 2001
From: Peter Chiu <chui-hao.chiu@mediatek.com>
Date: Tue, 18 Jan 2022 20:29:44 +0800
-Subject: [PATCH 900/912] mac80211: mtk: do not setup twt when twt responder is
+Subject: [PATCH 03/16] mac80211: mtk: do not setup twt when twt responder is
false
---
@@ -9,7 +9,7 @@
1 file changed, 3 insertions(+)
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
-index ba21e7c..02a0387 100644
+index cc11ac5..9f2a13b 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -3298,6 +3298,9 @@ ieee80211_process_rx_twt_action(struct ieee80211_rx_data *rx)
@@ -23,5 +23,5 @@
return false;
--
-2.36.1
+2.25.1
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/901-nl80211-mtk-extend-CAC-time-for-weather-radar-channe.patch b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0003-nl80211-mtk-extend-CAC-time-for-weather-radar-channe.patch
similarity index 88%
copy from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/901-nl80211-mtk-extend-CAC-time-for-weather-radar-channe.patch
copy to autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0003-nl80211-mtk-extend-CAC-time-for-weather-radar-channe.patch
index ce3c0cc..9113f7c 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/901-nl80211-mtk-extend-CAC-time-for-weather-radar-channe.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0003-nl80211-mtk-extend-CAC-time-for-weather-radar-channe.patch
@@ -1,7 +1,7 @@
-From 12941f847db1f4ee7eb6d82a50eee9568fb532e2 Mon Sep 17 00:00:00 2001
+From 7268cccc2ffc559d74d53adc610d75c9581b4ff6 Mon Sep 17 00:00:00 2001
From: Shayne Chen <shayne.chen@mediatek.com>
Date: Tue, 29 Mar 2022 16:06:30 +0800
-Subject: [PATCH 901/912] nl80211: mtk: extend CAC time for weather radar
+Subject: [PATCH 03/15] nl80211: mtk: extend CAC time for weather radar
channels
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
@@ -28,5 +28,5 @@
if (!err) {
wdev->links[0].ap.chandef = chandef;
--
-2.36.1
+2.25.1
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/902-mac80211-mtk-it-s-invalid-case-when-frag_threshold-i.patch b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0004-mac80211-mtk-it-s-invalid-case-when-frag_threshold-i.patch
similarity index 78%
copy from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/902-mac80211-mtk-it-s-invalid-case-when-frag_threshold-i.patch
copy to autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0004-mac80211-mtk-it-s-invalid-case-when-frag_threshold-i.patch
index 2a5a1db..f715c00 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/902-mac80211-mtk-it-s-invalid-case-when-frag_threshold-i.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0004-mac80211-mtk-it-s-invalid-case-when-frag_threshold-i.patch
@@ -1,8 +1,8 @@
-From a5ea1addb072fe46a4a0c76c2844dce02ae4f1a6 Mon Sep 17 00:00:00 2001
+From 0539f35c3c7b4335e961c167f48e603480348785 Mon Sep 17 00:00:00 2001
From: Bo Jiao <Bo.Jiao@mediatek.com>
Date: Fri, 1 Apr 2022 09:15:21 +0800
-Subject: [PATCH 902/912] mac80211: mtk: it's invalid case when frag_threshold
- is greater than 2346
+Subject: [PATCH 04/15] mac80211: mtk: it's invalid case when frag_threshold is
+ greater than 2346
Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
---
@@ -24,5 +24,5 @@
/*
* Fragments (apart from the last one) are required to
--
-2.36.1
+2.25.1
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/901-nl80211-mtk-extend-CAC-time-for-weather-radar-channe.patch b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0004-nl80211-mtk-extend-CAC-time-for-weather-radar-channe.patch
similarity index 88%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/901-nl80211-mtk-extend-CAC-time-for-weather-radar-channe.patch
rename to autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0004-nl80211-mtk-extend-CAC-time-for-weather-radar-channe.patch
index ce3c0cc..8850050 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/901-nl80211-mtk-extend-CAC-time-for-weather-radar-channe.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0004-nl80211-mtk-extend-CAC-time-for-weather-radar-channe.patch
@@ -1,7 +1,7 @@
-From 12941f847db1f4ee7eb6d82a50eee9568fb532e2 Mon Sep 17 00:00:00 2001
+From 85a6ee02c01369d1cde4b9c9a918ab068e2f35f7 Mon Sep 17 00:00:00 2001
From: Shayne Chen <shayne.chen@mediatek.com>
Date: Tue, 29 Mar 2022 16:06:30 +0800
-Subject: [PATCH 901/912] nl80211: mtk: extend CAC time for weather radar
+Subject: [PATCH 04/16] nl80211: mtk: extend CAC time for weather radar
channels
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
@@ -28,5 +28,5 @@
if (!err) {
wdev->links[0].ap.chandef = chandef;
--
-2.36.1
+2.25.1
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/903-mac80211-mtk-airtime_flags-depends-on-NL80211_EXT_FE.patch b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0005-mac80211-mtk-airtime_flags-depends-on-NL80211_EXT_FE.patch
similarity index 86%
copy from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/903-mac80211-mtk-airtime_flags-depends-on-NL80211_EXT_FE.patch
copy to autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0005-mac80211-mtk-airtime_flags-depends-on-NL80211_EXT_FE.patch
index f250335..e856980 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/903-mac80211-mtk-airtime_flags-depends-on-NL80211_EXT_FE.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0005-mac80211-mtk-airtime_flags-depends-on-NL80211_EXT_FE.patch
@@ -1,7 +1,7 @@
-From 27c84682bf5a0f935b736e03f1b1e3a6efe86303 Mon Sep 17 00:00:00 2001
+From 811ecfb4784a32764bc4a7090a9ce9f241063033 Mon Sep 17 00:00:00 2001
From: Evelyn Tsai <evelyn.tsai@mediatek.com>
Date: Wed, 19 Oct 2022 13:42:43 +0800
-Subject: [PATCH 903/912] mac80211: mtk: airtime_flags depends on
+Subject: [PATCH 05/15] mac80211: mtk: airtime_flags depends on
NL80211_EXT_FEATURE
Signed-off-by: Evelyn Tsai <evelyn.tsai@mediatek.com>
@@ -26,5 +26,5 @@
atomic_set(&local->aql_total_pending_airtime, 0);
--
-2.36.1
+2.25.1
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/902-mac80211-mtk-it-s-invalid-case-when-frag_threshold-i.patch b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0005-mac80211-mtk-it-s-invalid-case-when-frag_threshold-i.patch
similarity index 78%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/902-mac80211-mtk-it-s-invalid-case-when-frag_threshold-i.patch
rename to autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0005-mac80211-mtk-it-s-invalid-case-when-frag_threshold-i.patch
index 2a5a1db..8008118 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/902-mac80211-mtk-it-s-invalid-case-when-frag_threshold-i.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0005-mac80211-mtk-it-s-invalid-case-when-frag_threshold-i.patch
@@ -1,8 +1,8 @@
-From a5ea1addb072fe46a4a0c76c2844dce02ae4f1a6 Mon Sep 17 00:00:00 2001
+From 8c3a225a17490db52b25662bd56f4a0edc10bd1c Mon Sep 17 00:00:00 2001
From: Bo Jiao <Bo.Jiao@mediatek.com>
Date: Fri, 1 Apr 2022 09:15:21 +0800
-Subject: [PATCH 902/912] mac80211: mtk: it's invalid case when frag_threshold
- is greater than 2346
+Subject: [PATCH 05/16] mac80211: mtk: it's invalid case when frag_threshold is
+ greater than 2346
Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
---
@@ -24,5 +24,5 @@
/*
* Fragments (apart from the last one) are required to
--
-2.36.1
+2.25.1
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/904-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0006-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch
similarity index 97%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/904-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch
rename to autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0006-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch
index 0ac929b..53a2c4c 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/904-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0006-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch
@@ -1,7 +1,7 @@
-From 83e08e8194b7e9d476c72e98a4b05b29329719cb Mon Sep 17 00:00:00 2001
+From 061ed8b119b0cb900837f58b1f53345d4844f628 Mon Sep 17 00:00:00 2001
From: MeiChia Chiu <meichia.chiu@mediatek.com>
Date: Wed, 19 Oct 2022 13:45:42 +0800
-Subject: [PATCH 904/912] mac80211: mtk: add support for runtime set inband
+Subject: [PATCH 06/15] mac80211: mtk: add support for runtime set inband
discovery
Signed-off-by: MeiChia Chiu <meichia.chiu@mediatek.com>
@@ -26,7 +26,7 @@
/**
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
-index 6b16d6c..4485cfa 100644
+index edc10ff..dc4faea 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -525,6 +525,7 @@ struct ieee80211_ftm_responder_params {
@@ -178,5 +178,5 @@
}
--
-2.36.1
+2.25.1
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/903-mac80211-mtk-airtime_flags-depends-on-NL80211_EXT_FE.patch b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0006-mac80211-mtk-airtime_flags-depends-on-NL80211_EXT_FE.patch
similarity index 86%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/903-mac80211-mtk-airtime_flags-depends-on-NL80211_EXT_FE.patch
rename to autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0006-mac80211-mtk-airtime_flags-depends-on-NL80211_EXT_FE.patch
index f250335..011fd6d 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/903-mac80211-mtk-airtime_flags-depends-on-NL80211_EXT_FE.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0006-mac80211-mtk-airtime_flags-depends-on-NL80211_EXT_FE.patch
@@ -1,7 +1,7 @@
-From 27c84682bf5a0f935b736e03f1b1e3a6efe86303 Mon Sep 17 00:00:00 2001
+From f9465c98061810fead9564e143a0d399d56e115d Mon Sep 17 00:00:00 2001
From: Evelyn Tsai <evelyn.tsai@mediatek.com>
Date: Wed, 19 Oct 2022 13:42:43 +0800
-Subject: [PATCH 903/912] mac80211: mtk: airtime_flags depends on
+Subject: [PATCH 06/16] mac80211: mtk: airtime_flags depends on
NL80211_EXT_FEATURE
Signed-off-by: Evelyn Tsai <evelyn.tsai@mediatek.com>
@@ -26,5 +26,5 @@
atomic_set(&local->aql_total_pending_airtime, 0);
--
-2.36.1
+2.25.1
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/904-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0007-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch
similarity index 97%
copy from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/904-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch
copy to autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0007-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch
index 0ac929b..8f3a7fd 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/904-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0007-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch
@@ -1,7 +1,7 @@
-From 83e08e8194b7e9d476c72e98a4b05b29329719cb Mon Sep 17 00:00:00 2001
+From ecc272c2cd058ff4e9bf9206089538c7153028b8 Mon Sep 17 00:00:00 2001
From: MeiChia Chiu <meichia.chiu@mediatek.com>
Date: Wed, 19 Oct 2022 13:45:42 +0800
-Subject: [PATCH 904/912] mac80211: mtk: add support for runtime set inband
+Subject: [PATCH 07/16] mac80211: mtk: add support for runtime set inband
discovery
Signed-off-by: MeiChia Chiu <meichia.chiu@mediatek.com>
@@ -26,7 +26,7 @@
/**
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
-index 6b16d6c..4485cfa 100644
+index edc10ff..dc4faea 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -525,6 +525,7 @@ struct ieee80211_ftm_responder_params {
@@ -178,5 +178,5 @@
}
--
-2.36.1
+2.25.1
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/905-mac80211-mtk-remove-timerout-handle-for-ax210-iot-is.patch b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0007-mac80211-mtk-remove-timerout-handle-for-ax210-iot-is.patch
similarity index 86%
copy from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/905-mac80211-mtk-remove-timerout-handle-for-ax210-iot-is.patch
copy to autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0007-mac80211-mtk-remove-timerout-handle-for-ax210-iot-is.patch
index 5a1a077..79a777d 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/905-mac80211-mtk-remove-timerout-handle-for-ax210-iot-is.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0007-mac80211-mtk-remove-timerout-handle-for-ax210-iot-is.patch
@@ -1,7 +1,7 @@
-From 81949f8987417079f838e188d621921c70ce0243 Mon Sep 17 00:00:00 2001
+From 570a843495f61a3647d0ad231fb6c8a37e9e4f78 Mon Sep 17 00:00:00 2001
From: Evelyn Tsai <evelyn.tsai@mediatek.com>
Date: Wed, 19 Oct 2022 13:49:21 +0800
-Subject: [PATCH 905/912] mac80211: mtk: remove timerout handle for ax210 iot
+Subject: [PATCH 07/15] mac80211: mtk: remove timerout handle for ax210 iot
issue
Signed-off-by: Evelyn Tsai <evelyn.tsai@mediatek.com>
@@ -31,5 +31,5 @@
ht_dbg(sta->sdata, "tx session timer expired on %pM tid %d\n",
sta->sta.addr, tid);
--
-2.36.1
+2.25.1
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/906-cfg80211-mtk-implement-DFS-status-show-cac-and-nop-s.patch b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0008-cfg80211-mtk-implement-DFS-status-show-cac-and-nop-s.patch
similarity index 98%
copy from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/906-cfg80211-mtk-implement-DFS-status-show-cac-and-nop-s.patch
copy to autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0008-cfg80211-mtk-implement-DFS-status-show-cac-and-nop-s.patch
index ab81250..cdc3696 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/906-cfg80211-mtk-implement-DFS-status-show-cac-and-nop-s.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0008-cfg80211-mtk-implement-DFS-status-show-cac-and-nop-s.patch
@@ -1,7 +1,7 @@
-From abbf219e25183195fe2ddb675dcb5747d8a53622 Mon Sep 17 00:00:00 2001
+From 6d13f30716d0e227a6de05691617b09c6115b815 Mon Sep 17 00:00:00 2001
From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
Date: Thu, 22 Sep 2022 14:27:41 +0800
-Subject: [PATCH 906/912] cfg80211: mtk: implement DFS status show, cac and nop
+Subject: [PATCH 08/15] cfg80211: mtk: implement DFS status show, cac and nop
skip command via debugfs
Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
@@ -455,5 +455,5 @@
#undef TRACE_INCLUDE_PATH
--
-2.36.1
+2.25.1
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/905-mac80211-mtk-remove-timerout-handle-for-ax210-iot-is.patch b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0008-mac80211-mtk-remove-timerout-handle-for-ax210-iot-is.patch
similarity index 86%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/905-mac80211-mtk-remove-timerout-handle-for-ax210-iot-is.patch
rename to autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0008-mac80211-mtk-remove-timerout-handle-for-ax210-iot-is.patch
index 5a1a077..bf8111a 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/905-mac80211-mtk-remove-timerout-handle-for-ax210-iot-is.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0008-mac80211-mtk-remove-timerout-handle-for-ax210-iot-is.patch
@@ -1,7 +1,7 @@
-From 81949f8987417079f838e188d621921c70ce0243 Mon Sep 17 00:00:00 2001
+From 41ef202d35486326d8fc52466ef4ad6f7aa98e34 Mon Sep 17 00:00:00 2001
From: Evelyn Tsai <evelyn.tsai@mediatek.com>
Date: Wed, 19 Oct 2022 13:49:21 +0800
-Subject: [PATCH 905/912] mac80211: mtk: remove timerout handle for ax210 iot
+Subject: [PATCH 08/16] mac80211: mtk: remove timerout handle for ax210 iot
issue
Signed-off-by: Evelyn Tsai <evelyn.tsai@mediatek.com>
@@ -31,5 +31,5 @@
ht_dbg(sta->sdata, "tx session timer expired on %pM tid %d\n",
sta->sta.addr, tid);
--
-2.36.1
+2.25.1
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/906-cfg80211-mtk-implement-DFS-status-show-cac-and-nop-s.patch b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0009-cfg80211-mtk-implement-DFS-status-show-cac-and-nop-s.patch
similarity index 98%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/906-cfg80211-mtk-implement-DFS-status-show-cac-and-nop-s.patch
rename to autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0009-cfg80211-mtk-implement-DFS-status-show-cac-and-nop-s.patch
index ab81250..0d382ef 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/906-cfg80211-mtk-implement-DFS-status-show-cac-and-nop-s.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0009-cfg80211-mtk-implement-DFS-status-show-cac-and-nop-s.patch
@@ -1,7 +1,7 @@
-From abbf219e25183195fe2ddb675dcb5747d8a53622 Mon Sep 17 00:00:00 2001
+From 58f7244e69613f8248dd4e01f9c7920adb0f88f5 Mon Sep 17 00:00:00 2001
From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
Date: Thu, 22 Sep 2022 14:27:41 +0800
-Subject: [PATCH 906/912] cfg80211: mtk: implement DFS status show, cac and nop
+Subject: [PATCH 09/16] cfg80211: mtk: implement DFS status show, cac and nop
skip command via debugfs
Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
@@ -455,5 +455,5 @@
#undef TRACE_INCLUDE_PATH
--
-2.36.1
+2.25.1
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/907-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0009-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch
similarity index 83%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/907-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch
rename to autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0009-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch
index 31f77c7..485b867 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/907-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0009-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch
@@ -1,7 +1,7 @@
-From 9292503e99db5132eb8ca052e3574b5043f87579 Mon Sep 17 00:00:00 2001
+From ece45e8d4847943eb3ffd7195b9b26aac15d22e1 Mon Sep 17 00:00:00 2001
From: Howard Hsu <howard-yh.hsu@mediatek.com>
Date: Tue, 4 Oct 2022 10:47:05 +0800
-Subject: [PATCH 907/912] mac80211: mtk: Set TWT Information Frame Disabled bit
+Subject: [PATCH 09/15] mac80211: mtk: Set TWT Information Frame Disabled bit
as 1.
This modification means that current implementation do not support twt information frame.
@@ -22,5 +22,5 @@
/* broadcast TWT not supported yet */
if (twt->control & IEEE80211_TWT_CONTROL_NEG_TYPE_BROADCAST) {
--
-2.36.1
+2.25.1
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/907-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0010-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch
similarity index 83%
copy from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/907-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch
copy to autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0010-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch
index 31f77c7..aed4506 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/907-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0010-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch
@@ -1,7 +1,7 @@
-From 9292503e99db5132eb8ca052e3574b5043f87579 Mon Sep 17 00:00:00 2001
+From 981efca5e285e8b4e7c8e7f51bcbd86dc976097e Mon Sep 17 00:00:00 2001
From: Howard Hsu <howard-yh.hsu@mediatek.com>
Date: Tue, 4 Oct 2022 10:47:05 +0800
-Subject: [PATCH 907/912] mac80211: mtk: Set TWT Information Frame Disabled bit
+Subject: [PATCH 10/16] mac80211: mtk: Set TWT Information Frame Disabled bit
as 1.
This modification means that current implementation do not support twt information frame.
@@ -22,5 +22,5 @@
/* broadcast TWT not supported yet */
if (twt->control & IEEE80211_TWT_CONTROL_NEG_TYPE_BROADCAST) {
--
-2.36.1
+2.25.1
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/908-mac80211-mtk-fix-the-issue-of-AP-and-STA-starting-on.patch b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0010-mac80211-mtk-fix-the-issue-of-AP-and-STA-starting-on.patch
similarity index 97%
copy from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/908-mac80211-mtk-fix-the-issue-of-AP-and-STA-starting-on.patch
copy to autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0010-mac80211-mtk-fix-the-issue-of-AP-and-STA-starting-on.patch
index bc1be89..e43a34d 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/908-mac80211-mtk-fix-the-issue-of-AP-and-STA-starting-on.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0010-mac80211-mtk-fix-the-issue-of-AP-and-STA-starting-on.patch
@@ -1,8 +1,8 @@
-From a017232e4c904581cc1b57768a1ab326a0b97173 Mon Sep 17 00:00:00 2001
+From 92e220679d1786ba45088af847245affe463ea6d 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] mac80211: mtk: fix the issue of AP and STA starting on DFS
- channel concurrently
+Subject: [PATCH 10/15] mac80211: mtk: fix the issue of AP and STA starting on
+ DFS channel concurrently
Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
---
@@ -257,5 +257,5 @@
#undef TRACE_INCLUDE_PATH
--
-2.18.0
+2.25.1
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/909-mac80211-mtk-check-the-control-channel-before-downgr.patch b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0011-mac80211-mtk-check-the-control-channel-before-downgr.patch
similarity index 91%
copy from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/909-mac80211-mtk-check-the-control-channel-before-downgr.patch
copy to autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0011-mac80211-mtk-check-the-control-channel-before-downgr.patch
index 48eb6e9..684bfd5 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/909-mac80211-mtk-check-the-control-channel-before-downgr.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0011-mac80211-mtk-check-the-control-channel-before-downgr.patch
@@ -1,7 +1,7 @@
-From 1c406724813497c3a7679d67f53755c102be8f9a Mon Sep 17 00:00:00 2001
+From 828d20c7b88631e190c31193724d348ab2c21d90 Mon Sep 17 00:00:00 2001
From: Evelyn Tsai <evelyn.tsai@mediatek.com>
Date: Fri, 16 Dec 2022 03:31:06 +0800
-Subject: [PATCH 909/912] mac80211: mtk: check the control channel before
+Subject: [PATCH 11/15] mac80211: mtk: check the control channel before
downgrading the bandwidth
---
@@ -50,5 +50,5 @@
*conn_flags |=
ieee80211_chandef_downgrade(&chandef);
--
-2.36.1
+2.25.1
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/908-mac80211-mtk-fix-the-issue-of-AP-and-STA-starting-on.patch b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0011-mac80211-mtk-fix-the-issue-of-AP-and-STA-starting-on.patch
similarity index 97%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/908-mac80211-mtk-fix-the-issue-of-AP-and-STA-starting-on.patch
rename to autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0011-mac80211-mtk-fix-the-issue-of-AP-and-STA-starting-on.patch
index bc1be89..c42a00f 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/908-mac80211-mtk-fix-the-issue-of-AP-and-STA-starting-on.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0011-mac80211-mtk-fix-the-issue-of-AP-and-STA-starting-on.patch
@@ -1,8 +1,8 @@
-From a017232e4c904581cc1b57768a1ab326a0b97173 Mon Sep 17 00:00:00 2001
+From 7dd3aacd15e5678a617001dc329cf942ed7f4298 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] mac80211: mtk: fix the issue of AP and STA starting on DFS
- channel concurrently
+Subject: [PATCH 11/16] mac80211: mtk: fix the issue of AP and STA starting on
+ DFS channel concurrently
Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
---
@@ -257,5 +257,5 @@
#undef TRACE_INCLUDE_PATH
--
-2.18.0
+2.25.1
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/909-mac80211-mtk-check-the-control-channel-before-downgr.patch b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0012-mac80211-mtk-check-the-control-channel-before-downgr.patch
similarity index 91%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/909-mac80211-mtk-check-the-control-channel-before-downgr.patch
rename to autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0012-mac80211-mtk-check-the-control-channel-before-downgr.patch
index 48eb6e9..23b9ccb 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/909-mac80211-mtk-check-the-control-channel-before-downgr.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0012-mac80211-mtk-check-the-control-channel-before-downgr.patch
@@ -1,7 +1,7 @@
-From 1c406724813497c3a7679d67f53755c102be8f9a Mon Sep 17 00:00:00 2001
+From cc6f40e49bfdee7c824d4b158a060c2dc42ded4c Mon Sep 17 00:00:00 2001
From: Evelyn Tsai <evelyn.tsai@mediatek.com>
Date: Fri, 16 Dec 2022 03:31:06 +0800
-Subject: [PATCH 909/912] mac80211: mtk: check the control channel before
+Subject: [PATCH 12/16] mac80211: mtk: check the control channel before
downgrading the bandwidth
---
@@ -50,5 +50,5 @@
*conn_flags |=
ieee80211_chandef_downgrade(&chandef);
--
-2.36.1
+2.25.1
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/910-mac80211-mtk-fix-tx-amsdu-aggregation.patch b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0012-mac80211-mtk-fix-tx-amsdu-aggregation.patch
similarity index 88%
copy from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/910-mac80211-mtk-fix-tx-amsdu-aggregation.patch
copy to autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0012-mac80211-mtk-fix-tx-amsdu-aggregation.patch
index aba73e7..900fc65 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/910-mac80211-mtk-fix-tx-amsdu-aggregation.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0012-mac80211-mtk-fix-tx-amsdu-aggregation.patch
@@ -1,7 +1,7 @@
-From 63eb14a66a1ed384a0bb952b9b50fe81a859690a Mon Sep 17 00:00:00 2001
+From 93b3732a72b037e4cf321d640bcb28e97becbdb2 Mon Sep 17 00:00:00 2001
From: TomLiu <tomml.liu@mediatek.com>
Date: Wed, 14 Dec 2022 00:26:50 -0800
-Subject: [PATCH 910/912] mac80211: mtk: fix tx amsdu aggregation
+Subject: [PATCH 12/15] mac80211: mtk: fix tx amsdu aggregation
---
include/net/mac80211.h | 7 +++++++
@@ -9,10 +9,10 @@
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
-index 4485cfa..5429de0 100644
+index dc4faea..286810b 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
-@@ -2851,6 +2851,13 @@ static inline void _ieee80211_hw_set(struct ieee80211_hw *hw,
+@@ -2864,6 +2864,13 @@ static inline void _ieee80211_hw_set(struct ieee80211_hw *hw,
}
#define ieee80211_hw_set(hw, flg) _ieee80211_hw_set(hw, IEEE80211_HW_##flg)
@@ -51,5 +51,5 @@
capab |= u16_encode_bits(tid, IEEE80211_ADDBA_PARAM_TID_MASK);
capab |= u16_encode_bits(agg_size, IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK);
--
-2.36.1
+2.25.1
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/99900-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-i.patch b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0013-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-id.patch
similarity index 89%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/99900-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-i.patch
rename to autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0013-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-id.patch
index b755139..f8eda80 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/99900-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-i.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0013-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-id.patch
@@ -1,8 +1,7 @@
-From 2fddf05d7d9786a42466ec504c890f91e1944612 Mon Sep 17 00:00:00 2001
+From 6a53f434bf8c5841a30d25c464863e728186006d Mon Sep 17 00:00:00 2001
From: Sujuan Chen <sujuan.chen@mediatek.com>
Date: Wed, 18 May 2022 15:10:22 +0800
-Subject: [PATCH 99900/99901] mac80211: mtk: add fill receive path ops to get
- wed idx
+Subject: [PATCH 13/15] mac80211: mtk: add fill receive path ops to get wed idx
Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
---
@@ -14,7 +13,7 @@
mode change 100644 => 100755 net/mac80211/util.c
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
-index 5429de0..dd9e834 100644
+index 286810b..f68eb7d 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1354,7 +1354,7 @@ ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info)
@@ -35,7 +34,7 @@
* from the RX info data, so leave those zeroed when building this data)
* @RX_FLAG_RADIOTAP_HE_MU: HE MU radiotap data is present
* (&struct ieee80211_radiotap_he_mu)
-@@ -1911,6 +1911,12 @@ struct ieee80211_vif *wdev_to_ieee80211_vif(struct wireless_dev *wdev);
+@@ -1924,6 +1924,12 @@ struct ieee80211_vif *wdev_to_ieee80211_vif(struct wireless_dev *wdev);
*/
struct wireless_dev *ieee80211_vif_to_wdev(struct ieee80211_vif *vif);
@@ -48,7 +47,7 @@
/**
* lockdep_vif_mutex_held - for lockdep checks on link poiners
* @vif: the interface to check
-@@ -4180,6 +4186,8 @@ struct ieee80211_prep_tx_info {
+@@ -4193,6 +4199,8 @@ struct ieee80211_prep_tx_info {
* Note that a sta can also be inserted or removed with valid links,
* i.e. passed to @sta_add/@sta_state with sta->valid_links not zero.
* In fact, cannot change from having valid_links and not having them.
@@ -57,7 +56,7 @@
*/
struct ieee80211_ops {
void (*tx)(struct ieee80211_hw *hw,
-@@ -4535,6 +4543,9 @@ struct ieee80211_ops {
+@@ -4548,6 +4556,9 @@ struct ieee80211_ops {
struct ieee80211_vif *vif,
struct ieee80211_sta *sta,
u16 old_links, u16 new_links);
@@ -90,10 +89,10 @@
+
#endif /* __MAC80211_DRIVER_OPS */
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
-index 674b749..af8d96b 100644
+index 25a7545..6e76b23 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -918,6 +918,29 @@ out:
+@@ -920,6 +920,29 @@ out:
return ret;
}
@@ -123,7 +122,7 @@
static const struct net_device_ops ieee80211_dataif_8023_ops = {
.ndo_open = ieee80211_open,
.ndo_stop = ieee80211_stop,
-@@ -927,6 +950,7 @@ static const struct net_device_ops ieee80211_dataif_8023_ops = {
+@@ -929,6 +952,7 @@ static const struct net_device_ops ieee80211_dataif_8023_ops = {
.ndo_set_mac_address = ieee80211_change_mac,
.ndo_get_stats64 = ieee80211_get_stats64,
.ndo_fill_forward_path = ieee80211_netdev_fill_forward_path,
@@ -134,7 +133,7 @@
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
old mode 100644
new mode 100755
-index 005a730..189ab8a
+index 608f927..fd63ee3
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -914,6 +914,15 @@ struct wireless_dev *ieee80211_vif_to_wdev(struct ieee80211_vif *vif)
@@ -154,5 +153,5 @@
* Nothing should have been stuffed into the workqueue during
* the suspend->resume cycle. Since we can't check each caller
--
-2.36.1
+2.25.1
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/910-mac80211-mtk-fix-tx-amsdu-aggregation.patch b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0013-mac80211-mtk-fix-tx-amsdu-aggregation.patch
similarity index 88%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/910-mac80211-mtk-fix-tx-amsdu-aggregation.patch
rename to autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0013-mac80211-mtk-fix-tx-amsdu-aggregation.patch
index aba73e7..da3eede 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/910-mac80211-mtk-fix-tx-amsdu-aggregation.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0013-mac80211-mtk-fix-tx-amsdu-aggregation.patch
@@ -1,7 +1,7 @@
-From 63eb14a66a1ed384a0bb952b9b50fe81a859690a Mon Sep 17 00:00:00 2001
+From e07d5401accc96f8380bf42ec454c9ea42255196 Mon Sep 17 00:00:00 2001
From: TomLiu <tomml.liu@mediatek.com>
Date: Wed, 14 Dec 2022 00:26:50 -0800
-Subject: [PATCH 910/912] mac80211: mtk: fix tx amsdu aggregation
+Subject: [PATCH 13/16] mac80211: mtk: fix tx amsdu aggregation
---
include/net/mac80211.h | 7 +++++++
@@ -9,10 +9,10 @@
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
-index 4485cfa..5429de0 100644
+index dc4faea..286810b 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
-@@ -2851,6 +2851,13 @@ static inline void _ieee80211_hw_set(struct ieee80211_hw *hw,
+@@ -2864,6 +2864,13 @@ static inline void _ieee80211_hw_set(struct ieee80211_hw *hw,
}
#define ieee80211_hw_set(hw, flg) _ieee80211_hw_set(hw, IEEE80211_HW_##flg)
@@ -51,5 +51,5 @@
capab |= u16_encode_bits(tid, IEEE80211_ADDBA_PARAM_TID_MASK);
capab |= u16_encode_bits(agg_size, IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK);
--
-2.36.1
+2.25.1
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/99900-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-i.patch b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0014-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-id.patch
similarity index 89%
copy from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/99900-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-i.patch
copy to autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0014-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-id.patch
index b755139..277e231 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/99900-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-i.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0014-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-id.patch
@@ -1,8 +1,7 @@
-From 2fddf05d7d9786a42466ec504c890f91e1944612 Mon Sep 17 00:00:00 2001
+From b36c1fd5e967880b025a8301aadbeb832a364639 Mon Sep 17 00:00:00 2001
From: Sujuan Chen <sujuan.chen@mediatek.com>
Date: Wed, 18 May 2022 15:10:22 +0800
-Subject: [PATCH 99900/99901] mac80211: mtk: add fill receive path ops to get
- wed idx
+Subject: [PATCH 14/16] mac80211: mtk: add fill receive path ops to get wed idx
Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
---
@@ -14,7 +13,7 @@
mode change 100644 => 100755 net/mac80211/util.c
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
-index 5429de0..dd9e834 100644
+index 286810b..f68eb7d 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1354,7 +1354,7 @@ ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info)
@@ -35,7 +34,7 @@
* from the RX info data, so leave those zeroed when building this data)
* @RX_FLAG_RADIOTAP_HE_MU: HE MU radiotap data is present
* (&struct ieee80211_radiotap_he_mu)
-@@ -1911,6 +1911,12 @@ struct ieee80211_vif *wdev_to_ieee80211_vif(struct wireless_dev *wdev);
+@@ -1924,6 +1924,12 @@ struct ieee80211_vif *wdev_to_ieee80211_vif(struct wireless_dev *wdev);
*/
struct wireless_dev *ieee80211_vif_to_wdev(struct ieee80211_vif *vif);
@@ -48,7 +47,7 @@
/**
* lockdep_vif_mutex_held - for lockdep checks on link poiners
* @vif: the interface to check
-@@ -4180,6 +4186,8 @@ struct ieee80211_prep_tx_info {
+@@ -4193,6 +4199,8 @@ struct ieee80211_prep_tx_info {
* Note that a sta can also be inserted or removed with valid links,
* i.e. passed to @sta_add/@sta_state with sta->valid_links not zero.
* In fact, cannot change from having valid_links and not having them.
@@ -57,7 +56,7 @@
*/
struct ieee80211_ops {
void (*tx)(struct ieee80211_hw *hw,
-@@ -4535,6 +4543,9 @@ struct ieee80211_ops {
+@@ -4548,6 +4556,9 @@ struct ieee80211_ops {
struct ieee80211_vif *vif,
struct ieee80211_sta *sta,
u16 old_links, u16 new_links);
@@ -90,10 +89,10 @@
+
#endif /* __MAC80211_DRIVER_OPS */
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
-index 674b749..af8d96b 100644
+index 25a7545..6e76b23 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -918,6 +918,29 @@ out:
+@@ -920,6 +920,29 @@ out:
return ret;
}
@@ -123,7 +122,7 @@
static const struct net_device_ops ieee80211_dataif_8023_ops = {
.ndo_open = ieee80211_open,
.ndo_stop = ieee80211_stop,
-@@ -927,6 +950,7 @@ static const struct net_device_ops ieee80211_dataif_8023_ops = {
+@@ -929,6 +952,7 @@ static const struct net_device_ops ieee80211_dataif_8023_ops = {
.ndo_set_mac_address = ieee80211_change_mac,
.ndo_get_stats64 = ieee80211_get_stats64,
.ndo_fill_forward_path = ieee80211_netdev_fill_forward_path,
@@ -134,7 +133,7 @@
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
old mode 100644
new mode 100755
-index 005a730..189ab8a
+index 608f927..fd63ee3
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -914,6 +914,15 @@ struct wireless_dev *ieee80211_vif_to_wdev(struct ieee80211_vif *vif)
@@ -154,5 +153,5 @@
* Nothing should have been stuffed into the workqueue during
* the suspend->resume cycle. Since we can't check each caller
--
-2.36.1
+2.25.1
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/99902-mac80211-mtk-register-.ndo_setup_tc-to-support-wifi.patch b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0014-mac80211-mtk-register-.ndo_setup_tc-to-support-wifi2.patch
similarity index 89%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/99902-mac80211-mtk-register-.ndo_setup_tc-to-support-wifi.patch
rename to autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0014-mac80211-mtk-register-.ndo_setup_tc-to-support-wifi2.patch
index 9be85c9..ac1d074 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/99902-mac80211-mtk-register-.ndo_setup_tc-to-support-wifi.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0014-mac80211-mtk-register-.ndo_setup_tc-to-support-wifi2.patch
@@ -1,8 +1,8 @@
-From 1ca2a807a8067e585e628e6eb4721e7fee00acd6 Mon Sep 17 00:00:00 2001
+From 6aab78b1f4be0733251e8c21231627d164dd6629 Mon Sep 17 00:00:00 2001
From: Sujuan Chen <sujuan.chen@mediatek.com>
Date: Fri, 23 Dec 2022 18:12:41 +0800
-Subject: [PATCH] mac80211: mtk: register .ndo_setup_tc to support wifi2wifi
- offload
+Subject: [PATCH 14/15] mac80211: mtk: register .ndo_setup_tc to support
+ wifi2wifi offload
Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
---
@@ -11,10 +11,10 @@
2 files changed, 31 insertions(+)
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
-index dd9e834..d98312e 100644
+index f68eb7d..c453b19 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
-@@ -4188,6 +4188,8 @@ struct ieee80211_prep_tx_info {
+@@ -4201,6 +4201,8 @@ struct ieee80211_prep_tx_info {
* In fact, cannot change from having valid_links and not having them.
* @net_fill_receive_path: Called from .ndo_fill_receive_path in order to
* get a path for hardware flow offloading
@@ -23,7 +23,7 @@
*/
struct ieee80211_ops {
void (*tx)(struct ieee80211_hw *hw,
-@@ -4546,6 +4548,9 @@ struct ieee80211_ops {
+@@ -4559,6 +4561,9 @@ struct ieee80211_ops {
int (*net_fill_receive_path)(struct ieee80211_hw *hw,
struct net_device_path_ctx *ctx,
struct net_device_path *path);
@@ -85,5 +85,5 @@
dev->needs_free_netdev = true;
dev->priv_destructor = ieee80211_if_free;
--
-2.18.0
+2.25.1
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/99999-mac80211-mtk-fix-build-error-on-Linux-Kernel-5.4.patch b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0015-mac80211-mtk-fix-build-error-on-Linux-Kernel-5.4.patch
similarity index 90%
copy from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/99999-mac80211-mtk-fix-build-error-on-Linux-Kernel-5.4.patch
copy to autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0015-mac80211-mtk-fix-build-error-on-Linux-Kernel-5.4.patch
index a7bb3c4..23ae655 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/99999-mac80211-mtk-fix-build-error-on-Linux-Kernel-5.4.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0015-mac80211-mtk-fix-build-error-on-Linux-Kernel-5.4.patch
@@ -1,7 +1,7 @@
-From 4ca1834f804f70ffea6f95720d6145a56cd0414b Mon Sep 17 00:00:00 2001
+From 60b5e53162eed87b6d70f5f5d29a494497457282 Mon Sep 17 00:00:00 2001
From: Evelyn Tsai <evelyn.tsai@mediatek.com>
Date: Tue, 13 Dec 2022 09:04:49 +0800
-Subject: [PATCH] mac80211: mtk: fix build error on Linux Kernel 5.4
+Subject: [PATCH 15/15] mac80211: mtk: fix build error on Linux Kernel 5.4
---
include/linux/ieee80211.h | 8 +++-----
@@ -66,10 +66,10 @@
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
-index 7ce76e7..d6f836d 100644
+index cc8d4b2..8928a26 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
-@@ -16449,9 +16449,11 @@ static const struct genl_ops nl80211_ops[] = {
+@@ -16448,9 +16448,11 @@ static const struct genl_ops nl80211_ops[] = {
/* can be retrieved by unprivileged users */
.internal_flags = IFLAGS(NL80211_FLAG_NEED_WIPHY),
},
@@ -81,7 +81,7 @@
{
.cmd = NL80211_CMD_SET_WIPHY,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-@@ -17288,8 +17290,10 @@ static struct genl_family nl80211_fam __genl_ro_after_init = {
+@@ -17287,8 +17289,10 @@ static struct genl_family nl80211_fam __genl_ro_after_init = {
.module = THIS_MODULE,
.ops = nl80211_ops,
.n_ops = ARRAY_SIZE(nl80211_ops),
@@ -93,5 +93,5 @@
.resv_start_op = NL80211_CMD_REMOVE_LINK_STA + 1,
#endif
--
-2.36.1
+2.25.1
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/99902-mac80211-mtk-register-.ndo_setup_tc-to-support-wifi.patch b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0015-mac80211-mtk-register-.ndo_setup_tc-to-support-wifi2.patch
similarity index 89%
copy from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/99902-mac80211-mtk-register-.ndo_setup_tc-to-support-wifi.patch
copy to autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0015-mac80211-mtk-register-.ndo_setup_tc-to-support-wifi2.patch
index 9be85c9..60ab368 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/99902-mac80211-mtk-register-.ndo_setup_tc-to-support-wifi.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0015-mac80211-mtk-register-.ndo_setup_tc-to-support-wifi2.patch
@@ -1,8 +1,8 @@
-From 1ca2a807a8067e585e628e6eb4721e7fee00acd6 Mon Sep 17 00:00:00 2001
+From d0bf320b53011bf418e32991f899683280da184f Mon Sep 17 00:00:00 2001
From: Sujuan Chen <sujuan.chen@mediatek.com>
Date: Fri, 23 Dec 2022 18:12:41 +0800
-Subject: [PATCH] mac80211: mtk: register .ndo_setup_tc to support wifi2wifi
- offload
+Subject: [PATCH 15/16] mac80211: mtk: register .ndo_setup_tc to support
+ wifi2wifi offload
Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
---
@@ -11,10 +11,10 @@
2 files changed, 31 insertions(+)
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
-index dd9e834..d98312e 100644
+index f68eb7d..c453b19 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
-@@ -4188,6 +4188,8 @@ struct ieee80211_prep_tx_info {
+@@ -4201,6 +4201,8 @@ struct ieee80211_prep_tx_info {
* In fact, cannot change from having valid_links and not having them.
* @net_fill_receive_path: Called from .ndo_fill_receive_path in order to
* get a path for hardware flow offloading
@@ -23,7 +23,7 @@
*/
struct ieee80211_ops {
void (*tx)(struct ieee80211_hw *hw,
-@@ -4546,6 +4548,9 @@ struct ieee80211_ops {
+@@ -4559,6 +4561,9 @@ struct ieee80211_ops {
int (*net_fill_receive_path)(struct ieee80211_hw *hw,
struct net_device_path_ctx *ctx,
struct net_device_path *path);
@@ -85,5 +85,5 @@
dev->needs_free_netdev = true;
dev->priv_destructor = ieee80211_if_free;
--
-2.18.0
+2.25.1
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/99999-mac80211-mtk-fix-build-error-on-Linux-Kernel-5.4.patch b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0016-mac80211-mtk-fix-build-error-on-Linux-Kernel-5.4.patch
similarity index 90%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/99999-mac80211-mtk-fix-build-error-on-Linux-Kernel-5.4.patch
rename to autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0016-mac80211-mtk-fix-build-error-on-Linux-Kernel-5.4.patch
index a7bb3c4..bb53403 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/99999-mac80211-mtk-fix-build-error-on-Linux-Kernel-5.4.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0016-mac80211-mtk-fix-build-error-on-Linux-Kernel-5.4.patch
@@ -1,7 +1,7 @@
-From 4ca1834f804f70ffea6f95720d6145a56cd0414b Mon Sep 17 00:00:00 2001
+From 12d2196bb600818a9fc9081037c509f2624b2d25 Mon Sep 17 00:00:00 2001
From: Evelyn Tsai <evelyn.tsai@mediatek.com>
Date: Tue, 13 Dec 2022 09:04:49 +0800
-Subject: [PATCH] mac80211: mtk: fix build error on Linux Kernel 5.4
+Subject: [PATCH 16/16] mac80211: mtk: fix build error on Linux Kernel 5.4
---
include/linux/ieee80211.h | 8 +++-----
@@ -66,10 +66,10 @@
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
-index 7ce76e7..d6f836d 100644
+index cc8d4b2..8928a26 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
-@@ -16449,9 +16449,11 @@ static const struct genl_ops nl80211_ops[] = {
+@@ -16448,9 +16448,11 @@ static const struct genl_ops nl80211_ops[] = {
/* can be retrieved by unprivileged users */
.internal_flags = IFLAGS(NL80211_FLAG_NEED_WIPHY),
},
@@ -81,7 +81,7 @@
{
.cmd = NL80211_CMD_SET_WIPHY,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-@@ -17288,8 +17290,10 @@ static struct genl_family nl80211_fam __genl_ro_after_init = {
+@@ -17287,8 +17289,10 @@ static struct genl_family nl80211_fam __genl_ro_after_init = {
.module = THIS_MODULE,
.ops = nl80211_ops,
.n_ops = ARRAY_SIZE(nl80211_ops),
@@ -93,5 +93,5 @@
.resv_start_op = NL80211_CMD_REMOVE_LINK_STA + 1,
#endif
--
-2.36.1
+2.25.1