[][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