[][MAC80211][Rebase Patches][Fix WiFi6 build error]
[Description]
Fix build fail
[Release-log]
N/A
Change-Id: I59e88e1b39fc9e950a75c0ecae7f42a5e08b1516
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/7806254
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0001-mac80211-mtk-do-not-setup-twt-when-twt-responder-is-.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0001-mac80211-mtk-do-not-setup-twt-when-twt-responder-is-.patch
index cf10b5b..1b0c5ac 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0001-mac80211-mtk-do-not-setup-twt-when-twt-responder-is-.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0001-mac80211-mtk-do-not-setup-twt-when-twt-responder-is-.patch
@@ -1,7 +1,7 @@
-From 22202726453e5648e92ec4bb0168076fac9e79c7 Mon Sep 17 00:00:00 2001
+From a5203b727516ebc2a7cddf1e7459be72892764cb 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 01/17] mac80211: mtk: do not setup twt when twt responder is
+Subject: [PATCH 01/19] mac80211: mtk: do not setup twt when twt responder is
false
---
@@ -9,10 +9,10 @@
1 file changed, 3 insertions(+)
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
-index b991151..eb16838 100644
+index ac5afea..230c4b0 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
-@@ -3283,6 +3283,9 @@ ieee80211_process_rx_twt_action(struct ieee80211_rx_data *rx)
+@@ -3284,6 +3284,9 @@ ieee80211_process_rx_twt_action(struct ieee80211_rx_data *rx)
if (sdata->vif.type != NL80211_IFTYPE_AP)
return false;
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0002-cfg80211-mtk-extend-CAC-time-for-weather-radar-chann.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0002-cfg80211-mtk-extend-CAC-time-for-weather-radar-chann.patch
index 8ea22c1..2975304 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0002-cfg80211-mtk-extend-CAC-time-for-weather-radar-chann.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0002-cfg80211-mtk-extend-CAC-time-for-weather-radar-chann.patch
@@ -1,7 +1,8 @@
-From 1eb46f8a687f8c458893c63344e63c63bcdb81f1 Mon Sep 17 00:00:00 2001
+From 6bd3d906bd48ebe0e65c7173af1c7f59e4230d04 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] cfg80211: mtk: extend CAC time for weather radar channels
+Subject: [PATCH 02/19] cfg80211: mtk: extend CAC time for weather radar
+ channels
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
@@ -12,7 +13,7 @@
3 files changed, 11 insertions(+)
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
-index 8e05f55..585d934 100644
+index 4277f96..d1a88e2 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -142,6 +142,7 @@ enum ieee80211_channel_flags {
@@ -24,7 +25,7 @@
/**
diff --git a/net/wireless/chan.c b/net/wireless/chan.c
-index 5f50ac4..51506f8 100644
+index 5f50ac4..c217276 100644
--- a/net/wireless/chan.c
+++ b/net/wireless/chan.c
@@ -843,6 +843,13 @@ static unsigned int cfg80211_get_chans_dfs_cac_time(struct wiphy *wiphy,
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0003-mac80211-mtk-it-s-invalid-case-when-frag_threshold-i.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0003-mac80211-mtk-it-s-invalid-case-when-frag_threshold-i.patch
index 320b2ad..e06c0a0 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0003-mac80211-mtk-it-s-invalid-case-when-frag_threshold-i.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0003-mac80211-mtk-it-s-invalid-case-when-frag_threshold-i.patch
@@ -1,7 +1,7 @@
-From 3752aaaf5c78368fb0f8e7e567782d4ec55a4a14 Mon Sep 17 00:00:00 2001
+From fe00d31bd57181e9f9b0f6b10483e9193282be05 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 03/17] mac80211: mtk: it's invalid case when frag_threshold is
+Subject: [PATCH 03/19] mac80211: mtk: it's invalid case when frag_threshold is
greater than 2346
Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
@@ -10,7 +10,7 @@
1 file changed, 3 insertions(+)
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
-index 3c6c1df..1292634 100644
+index bc07fe8..4631bb1 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -3495,6 +3495,9 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0004-mac80211-mtk-correct-legacy-rates-check-in-ieee80211.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0004-mac80211-mtk-correct-legacy-rates-check-in-ieee80211.patch
index d4bdd51..c2a1370 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0004-mac80211-mtk-correct-legacy-rates-check-in-ieee80211.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0004-mac80211-mtk-correct-legacy-rates-check-in-ieee80211.patch
@@ -1,7 +1,7 @@
-From 86cc94d1060840b23fc5ca362b72917cd8541a2e Mon Sep 17 00:00:00 2001
+From 6ebe31fadb5008b7b9591e1d2d1761aaf8e2885d Mon Sep 17 00:00:00 2001
From: MeiChia Chiu <MeiChia.Chiu@mediatek.com>
Date: Mon, 7 Mar 2022 15:18:00 +0800
-Subject: [PATCH 04/17] mac80211: mtk: correct legacy rates check in
+Subject: [PATCH 04/19] mac80211: mtk: correct legacy rates check in
ieee80211_calc_rx_airtime
There are no legacy rates on 60GHz or sub-1Ghz band, so modify the check.
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0005-mac80211-mtk-airtime_flags-depends-on-NL80211_EXT_FE.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0005-mac80211-mtk-airtime_flags-depends-on-NL80211_EXT_FE.patch
index d804171..9104818 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0005-mac80211-mtk-airtime_flags-depends-on-NL80211_EXT_FE.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0005-mac80211-mtk-airtime_flags-depends-on-NL80211_EXT_FE.patch
@@ -1,7 +1,7 @@
-From ab517887ba2464c9b27c600cd2930a539a791c2a Mon Sep 17 00:00:00 2001
+From cfd88f268f5d058e64d8b4b1d5e7ce391fa9ac25 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 05/17] mac80211: mtk: airtime_flags depends on
+Subject: [PATCH 05/19] mac80211: mtk: airtime_flags depends on
NL80211_EXT_FEATURE
Signed-off-by: Evelyn Tsai <evelyn.tsai@mediatek.com>
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0006-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0006-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch
index 9e5b682..cef8474 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0006-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0006-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch
@@ -1,7 +1,7 @@
-From 8f8598d2e6a82a2a1d43e8e86a8d43e185cd1807 Mon Sep 17 00:00:00 2001
+From 31a0ee224e1a8d9764c462e1ab1cc1a8775733be 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 06/17] mac80211: mtk: add support for runtime set inband
+Subject: [PATCH 06/19] mac80211: mtk: add support for runtime set inband
discovery
Signed-off-by: MeiChia Chiu <meichia.chiu@mediatek.com>
@@ -14,10 +14,10 @@
5 files changed, 61 insertions(+), 5 deletions(-)
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
-index 8e05f55..ae2af09 100644
+index d1a88e2..1170703 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
-@@ -1158,6 +1158,7 @@ struct cfg80211_fils_discovery {
+@@ -1159,6 +1159,7 @@ struct cfg80211_fils_discovery {
u32 max_interval;
size_t tmpl_len;
const u8 *tmpl;
@@ -26,7 +26,7 @@
/**
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
-index 7edb0f0..587a1d6 100644
+index 04c0d09..4727393 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -505,6 +505,7 @@ struct ieee80211_ftm_responder_params {
@@ -50,7 +50,7 @@
/* keep last */
__NL80211_FILS_DISCOVERY_ATTR_LAST,
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
-index 0711c75..544dcf5 100644
+index 79995f3..e008a1e 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -906,6 +906,7 @@ static int ieee80211_set_fils_discovery(struct ieee80211_sub_if_data *sdata,
@@ -107,7 +107,7 @@
}
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
-index 1292634..a20aba5 100644
+index 4631bb1..c41675f 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -421,6 +421,7 @@ nl80211_fils_discovery_policy[NL80211_FILS_DISCOVERY_ATTR_MAX + 1] = {
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0007-mac80211-mtk-add-s1g-category-to-_ieee80211_is_robus.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0007-mac80211-mtk-add-s1g-category-to-_ieee80211_is_robus.patch
index 647b3f5..a106c6c 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0007-mac80211-mtk-add-s1g-category-to-_ieee80211_is_robus.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0007-mac80211-mtk-add-s1g-category-to-_ieee80211_is_robus.patch
@@ -1,7 +1,7 @@
-From c45c2ccc4c042e5430d43ce4b6bf2b70d7d8f514 Mon Sep 17 00:00:00 2001
+From e7b1e74111386828cb21b22cd2273674cada075e Mon Sep 17 00:00:00 2001
From: Peter Chiu <chui-hao.chiu@mediatek.com>
Date: Wed, 8 Jun 2022 10:26:39 +0800
-Subject: [PATCH 07/17] mac80211: mtk: add s1g category to
+Subject: [PATCH 07/19] mac80211: mtk: add s1g category to
_ieee80211_is_robust_mgmt_frame
Unprotected S1G with code 22 is not robust mgmt frame.
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0008-mac80211-mtk-make-4addr-null-frames-using-min_rate-f.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0008-mac80211-mtk-make-4addr-null-frames-using-min_rate-f.patch
index 37de852..180227b 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0008-mac80211-mtk-make-4addr-null-frames-using-min_rate-f.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0008-mac80211-mtk-make-4addr-null-frames-using-min_rate-f.patch
@@ -1,7 +1,7 @@
-From a8adfd3802d6dfa399405e1768aed02d53aac53a Mon Sep 17 00:00:00 2001
+From b3fd0abe777204781c02234fa481f3e8463f47cb Mon Sep 17 00:00:00 2001
From: Lian Chen <lian.chen@mediatek.com>
Date: Thu, 14 Jul 2022 16:33:58 +0800
-Subject: [PATCH 08/17] mac80211: mtk: make 4addr null frames using min_rate
+Subject: [PATCH 08/19] mac80211: mtk: make 4addr null frames using min_rate
for WDS
WDS needs 4addr packets to trigger AP for wlan0.sta creation.
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0009-cfg80211-mtk-implement-DFS-status-show-cac-and-nop-s.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0009-cfg80211-mtk-implement-DFS-status-show-cac-and-nop-s.patch
index b872374..654c31d 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0009-cfg80211-mtk-implement-DFS-status-show-cac-and-nop-s.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0009-cfg80211-mtk-implement-DFS-status-show-cac-and-nop-s.patch
@@ -1,8 +1,8 @@
-From cc87cfb17dfe07759d56dc3cd2fe05477cf3daa4 Mon Sep 17 00:00:00 2001
+From 822360269ad225fe0c1c1e39c50d572159edeb28 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] cfg80211: mtk: implement DFS status show, cac and nop skip
- command via debugfs
+Subject: [PATCH 09/19] cfg80211: mtk: implement DFS status show, cac and nop
+ skip command via debugfs
Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
---
@@ -16,10 +16,10 @@
7 files changed, 358 insertions(+), 7 deletions(-)
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
-index ae2af09..b97ddbd 100644
+index 1170703..77276db 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
-@@ -4401,6 +4401,7 @@ struct cfg80211_ops {
+@@ -4402,6 +4402,7 @@ struct cfg80211_ops {
struct cfg80211_color_change_settings *params);
int (*set_radar_background)(struct wiphy *wiphy,
struct cfg80211_chan_def *chandef);
@@ -28,7 +28,7 @@
/*
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
-index 544dcf5..0a6257d 100644
+index e008a1e..2a173dd 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -4501,6 +4501,24 @@ ieee80211_set_radar_background(struct wiphy *wiphy,
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0010-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0010-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch
index c859a0d..f59878f 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0010-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0010-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch
@@ -1,7 +1,7 @@
-From 3bd97531ce8c3828b0ae570b11668e4c227bb940 Mon Sep 17 00:00:00 2001
+From a804ae4d0d5fc5ba75feae005c9f636ce2bedda9 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 10/17] mac80211: mtk: Set TWT Information Frame Disabled bit
+Subject: [PATCH 10/19] mac80211: mtk: Set TWT Information Frame Disabled bit
as 1.
This modification means that current implementation do not support twt information frame.
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0011-mac80211-mtk-check-the-control-channel-before-downgr.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0011-mac80211-mtk-check-the-control-channel-before-downgr.patch
index 0783ea5..63e7cf0 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0011-mac80211-mtk-check-the-control-channel-before-downgr.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0011-mac80211-mtk-check-the-control-channel-before-downgr.patch
@@ -1,7 +1,7 @@
-From ab3728fbce6284929abae90db4d2227a1c9fc3b0 Mon Sep 17 00:00:00 2001
+From 80b607df469b86f248e3f954b9cc9545895d8399 Mon Sep 17 00:00:00 2001
From: mtk31095 <michael-cy.lee@mediatek.com>
Date: Fri, 16 Dec 2022 10:37:53 +0800
-Subject: [PATCH 11/17] mac80211: mtk: check the control channel before
+Subject: [PATCH 11/19] mac80211: mtk: check the control channel before
downgrading the bandwidth
Signed-off-by: mtk31095 <michael-cy.lee@mediatek.com>
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0012-mac80211-mtk-fix-tx-amsdu-aggregation.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0012-mac80211-mtk-fix-tx-amsdu-aggregation.patch
index 57c5d93..60bafa6 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0012-mac80211-mtk-fix-tx-amsdu-aggregation.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0012-mac80211-mtk-fix-tx-amsdu-aggregation.patch
@@ -1,7 +1,7 @@
-From 21dcc00df24dc33301a3ad9749ddcb9f3b9d6d47 Mon Sep 17 00:00:00 2001
+From 2123cb199e2ea8b2153103a6b0340787cd5496ee Mon Sep 17 00:00:00 2001
From: TomLiu <tomml.liu@mediatek.com>
Date: Wed, 14 Dec 2022 00:26:50 -0800
-Subject: [PATCH 12/17] mac80211: mtk: fix tx amsdu aggregation
+Subject: [PATCH 12/19] mac80211: mtk: fix tx amsdu aggregation
---
include/net/mac80211.h | 7 +++++++
@@ -9,7 +9,7 @@
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
-index 587a1d6..2c40833 100644
+index 4727393..7d824de 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -2668,6 +2668,13 @@ static inline void _ieee80211_hw_set(struct ieee80211_hw *hw,
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0013-mac80211-mtk-add-sta-assisted-DFS-state-update-mecha.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0013-mac80211-mtk-add-sta-assisted-DFS-state-update-mecha.patch
index c0bd42f..5bd6dfd 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0013-mac80211-mtk-add-sta-assisted-DFS-state-update-mecha.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0013-mac80211-mtk-add-sta-assisted-DFS-state-update-mecha.patch
@@ -1,7 +1,7 @@
-From 49f5a07866ca6a6be26cec9886e702d54308a78c Mon Sep 17 00:00:00 2001
+From 7a5c5d30c9f95cf990c415c4edb3359ac1c1ab5b Mon Sep 17 00:00:00 2001
From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
Date: Mon, 20 Feb 2023 14:25:24 +0800
-Subject: [PATCH 13/17] mac80211: mtk: add sta-assisted DFS state update
+Subject: [PATCH 13/19] mac80211: mtk: add sta-assisted DFS state update
mechanism
Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
@@ -13,10 +13,10 @@
4 files changed, 91 insertions(+)
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
-index b97ddbd..02ad2b2 100644
+index 77276db..03f072f 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
-@@ -7641,6 +7641,20 @@ void cfg80211_cac_event(struct net_device *netdev,
+@@ -7642,6 +7642,20 @@ void cfg80211_cac_event(struct net_device *netdev,
const struct cfg80211_chan_def *chandef,
enum nl80211_radar_event event, gfp_t gfp);
@@ -98,7 +98,7 @@
/*
* destroy assoc_data afterwards, as otherwise an idle
diff --git a/net/wireless/chan.c b/net/wireless/chan.c
-index 5f50ac4..0309758 100644
+index c217276..9f651f9 100644
--- a/net/wireless/chan.c
+++ b/net/wireless/chan.c
@@ -14,6 +14,7 @@
@@ -109,7 +109,7 @@
static bool cfg80211_valid_60g_freq(u32 freq)
{
-@@ -1386,3 +1387,62 @@ bool cfg80211_any_usable_channels(struct wiphy *wiphy,
+@@ -1393,3 +1394,62 @@ bool cfg80211_any_usable_channels(struct wiphy *wiphy,
return false;
}
EXPORT_SYMBOL(cfg80211_any_usable_channels);
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0014-nl80211-mtk-Mark-DFS-channel-as-available-for-CSA.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0014-nl80211-mtk-Mark-DFS-channel-as-available-for-CSA.patch
index a737760..f45b5a2 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0014-nl80211-mtk-Mark-DFS-channel-as-available-for-CSA.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0014-nl80211-mtk-Mark-DFS-channel-as-available-for-CSA.patch
@@ -1,17 +1,17 @@
-From 733a9401bcdc8b01fc7b914599da04d847d50417 Mon Sep 17 00:00:00 2001
+From 67a8f56b6182bd6fe6fd47d296447f6322152290 Mon Sep 17 00:00:00 2001
From: "himanshu.goyal" <himanshu.goyal@mediatek.com>
Date: Fri, 17 Mar 2023 17:36:01 +0800
-Subject: [PATCH 14/17] nl80211: mtk: Mark DFS channel as available for CSA.
+Subject: [PATCH 14/19] nl80211: mtk: Mark DFS channel as available for CSA.
---
net/wireless/nl80211.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
-index a20aba5..62698c2 100644
+index c41675f..0917713 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
-@@ -9620,6 +9620,11 @@ skip_beacons:
+@@ -9616,6 +9616,11 @@ skip_beacons:
if (err)
goto free;
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0015-mac80211-mtk-track-obss-color-bitmap.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0015-mac80211-mtk-track-obss-color-bitmap.patch
index 18f7508..d309f6a 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0015-mac80211-mtk-track-obss-color-bitmap.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0015-mac80211-mtk-track-obss-color-bitmap.patch
@@ -1,7 +1,7 @@
-From 522654071f8ec8ae69eef5a9bac27f8e6b3f7597 Mon Sep 17 00:00:00 2001
+From 2f32a2318ed334c191f9336560e20d75bc1332ca Mon Sep 17 00:00:00 2001
From: Yi-Chia Hsieh <yi-chia.hsieh@mediatek.com>
Date: Wed, 8 Mar 2023 06:23:55 +0800
-Subject: [PATCH 15/17] mac80211: mtk: track obss color bitmap
+Subject: [PATCH 15/19] mac80211: mtk: track obss color bitmap
Track OBSS BSS color when receive their beacon.
@@ -11,12 +11,12 @@
---
include/net/mac80211.h | 5 +++--
net/mac80211/cfg.c | 4 ++--
- net/mac80211/rx.c | 9 +++++++--
+ net/mac80211/rx.c | 7 ++++++-
net/mac80211/trace.h | 21 +++++++++++++++++++++
- 4 files changed, 33 insertions(+), 6 deletions(-)
+ 4 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
-index 2c40833..1a26ccd 100644
+index 7d824de..ba19152 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -699,6 +699,7 @@ struct ieee80211_bss_conf {
@@ -36,17 +36,17 @@
* collision.
*
* @vif: &struct ieee80211_vif pointer from the add_interface callback.
-@@ -6889,7 +6890,7 @@ ieee80211_get_unsol_bcast_probe_resp_tmpl(struct ieee80211_hw *hw,
- * aware of.
+@@ -6890,7 +6891,7 @@ ieee80211_get_unsol_bcast_probe_resp_tmpl(struct ieee80211_hw *hw,
+ * @gfp: allocation flags
*/
void
-ieeee80211_obss_color_collision_notify(struct ieee80211_vif *vif,
+ieee80211_obss_color_collision_notify(struct ieee80211_vif *vif,
- u64 color_bitmap);
+ u64 color_bitmap, gfp_t gfp);
/**
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
-index 0a6257d..86d231b 100644
+index 2a173dd..81cfaa6 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -4435,7 +4435,7 @@ void ieee80211_color_change_finish(struct ieee80211_vif *vif)
@@ -55,12 +55,12 @@
void
-ieeee80211_obss_color_collision_notify(struct ieee80211_vif *vif,
+ieee80211_obss_color_collision_notify(struct ieee80211_vif *vif,
- u64 color_bitmap)
+ u64 color_bitmap, gfp_t gfp)
{
struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);
@@ -4445,7 +4445,7 @@ ieeee80211_obss_color_collision_notify(struct ieee80211_vif *vif,
- cfg80211_obss_color_collision_notify(sdata->dev, color_bitmap);
+ cfg80211_obss_color_collision_notify(sdata->dev, color_bitmap, gfp);
}
-EXPORT_SYMBOL_GPL(ieeee80211_obss_color_collision_notify);
+EXPORT_SYMBOL_GPL(ieee80211_obss_color_collision_notify);
@@ -68,10 +68,10 @@
static int
ieee80211_color_change(struct wiphy *wiphy, struct net_device *dev,
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
-index eb16838..36fcf97 100644
+index 230c4b0..feb9f90 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
-@@ -3219,9 +3219,14 @@ ieee80211_rx_check_bss_color_collision(struct ieee80211_rx_data *rx)
+@@ -3219,8 +3219,13 @@ ieee80211_rx_check_bss_color_collision(struct ieee80211_rx_data *rx)
color = le32_get_bits(he_oper->he_oper_params,
IEEE80211_HE_OPERATION_BSS_COLOR_MASK);
@@ -82,12 +82,10 @@
+
if (color == bss_conf->he_bss_color.color)
- ieeee80211_obss_color_collision_notify(&rx->sdata->vif,
-- BIT_ULL(color));
+ ieee80211_obss_color_collision_notify(&rx->sdata->vif,
-+ bss_conf->used_color_bitmap);
+ BIT_ULL(color),
+ GFP_ATOMIC);
}
- }
-
diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h
index c34067c..d15dadd 100644
--- a/net/mac80211/trace.h
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0016-mac80211-mtk-ageout-color-bitmap.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0016-mac80211-mtk-ageout-color-bitmap.patch
index 06d6d8b..a381688 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0016-mac80211-mtk-ageout-color-bitmap.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0016-mac80211-mtk-ageout-color-bitmap.patch
@@ -1,7 +1,7 @@
-From 61d499cf2de7201642cd7175b5c067b1e17309c2 Mon Sep 17 00:00:00 2001
+From 9d897fd1187c4c3be62b441b6fb81295eb2e7313 Mon Sep 17 00:00:00 2001
From: Yi-Chia Hsieh <yi-chia.hsieh@mediatek.com>
Date: Wed, 8 Mar 2023 06:32:42 +0800
-Subject: [PATCH 16/17] mac80211: mtk: ageout color bitmap
+Subject: [PATCH 16/19] mac80211: mtk: ageout color bitmap
Adding a periodic work which runs once per second to check BSS color.
OBSS BSS Color will be ageout if not seen for 10 seconds.
@@ -14,7 +14,7 @@
5 files changed, 43 insertions(+)
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
-index 1a26ccd..28ec7e8 100644
+index ba19152..3e50a72 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -700,6 +700,7 @@ struct ieee80211_bss_conf {
@@ -26,7 +26,7 @@
u32 unsol_bcast_probe_resp_interval;
bool s1g;
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
-index 86d231b..7449777 100644
+index 81cfaa6..95ca8a4 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -4425,6 +4425,35 @@ unlock:
@@ -123,7 +123,7 @@
for (i = 0; i < NUM_NL80211_BANDS; i++) {
struct ieee80211_supported_band *sband;
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
-index 36fcf97..838085f 100644
+index feb9f90..6d8ce15 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -3221,6 +3221,7 @@ ieee80211_rx_check_bss_color_collision(struct ieee80211_rx_data *rx)
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0017-mac80211-mtk-update-max_bssid_indicator-based-on-rea.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0017-mac80211-mtk-update-max_bssid_indicator-based-on-rea.patch
index 85a3320..e314a9d 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0017-mac80211-mtk-update-max_bssid_indicator-based-on-rea.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0017-mac80211-mtk-update-max_bssid_indicator-based-on-rea.patch
@@ -1,7 +1,7 @@
-From 52bbeb36a98ea83762908b19b3ba3ba3bf3eeb07 Mon Sep 17 00:00:00 2001
+From b20079072560a987e0248c960a6c0f2cdbbe8ab7 Mon Sep 17 00:00:00 2001
From: Evelyn Tsai <evelyn.tsai@mediatek.com>
Date: Fri, 14 Apr 2023 06:55:22 +0800
-Subject: [PATCH 17/17] mac80211: mtk: update max_bssid_indicator based on real
+Subject: [PATCH 17/19] mac80211: mtk: update max_bssid_indicator based on real
BSS numbers
---
@@ -9,7 +9,7 @@
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
-index 7449777..b801df7 100644
+index 95ca8a4..56381f8 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1073,8 +1073,7 @@ static int ieee80211_assign_beacon(struct ieee80211_sub_if_data *sdata,
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0018-mac80211-support-configurable-addba-resp-time.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0018-mac80211-mtk-support-configurable-addba-resp-time.patch
similarity index 89%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0018-mac80211-support-configurable-addba-resp-time.patch
rename to autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0018-mac80211-mtk-support-configurable-addba-resp-time.patch
index 759d36b..a46f2cc 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0018-mac80211-support-configurable-addba-resp-time.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0018-mac80211-mtk-support-configurable-addba-resp-time.patch
@@ -1,7 +1,7 @@
-From 0236a4a01f3f3ed932ab326de0deef6911519dab Mon Sep 17 00:00:00 2001
+From aad4949a5c4e13a7bff49a4bfae2b5bc90e65143 Mon Sep 17 00:00:00 2001
From: Lian Chen <lian.chen@mediatek.com>
Date: Wed, 7 Jun 2023 15:30:34 +0800
-Subject: [PATCH] support configurable addba resp time.
+Subject: [PATCH 18/19] mac80211: mtk: support configurable addba resp time.
---
net/mac80211/agg-tx.c | 8 +++++++-
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0019-mac80211-mtk-export-ieee80211_tpt_led_trig_tx-rx-for.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0019-mac80211-mtk-export-ieee80211_tpt_led_trig_tx-rx-for.patch
index ba52873..e6a298e 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0019-mac80211-mtk-export-ieee80211_tpt_led_trig_tx-rx-for.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0019-mac80211-mtk-export-ieee80211_tpt_led_trig_tx-rx-for.patch
@@ -1,7 +1,8 @@
-From 29de32dac9d97caf3e40cdae58b78a18d6277cf1 Mon Sep 17 00:00:00 2001
+From 758c358967c017318904a48f82857b75c16e4973 Mon Sep 17 00:00:00 2001
From: Yi-Chia Hsieh <yi-chia.hsieh@mediatek.com>
Date: Thu, 13 Jul 2023 08:27:37 +0800
-Subject: [PATCH] mac80211: mtk: export ieee80211_tpt_led_trig_tx/rx for driver
+Subject: [PATCH 19/19] mac80211: mtk: export ieee80211_tpt_led_trig_tx/rx for
+ driver
Whenever the H/W path is enabled and traffic is in the binding state,
mac80211 is not aware of the traffic. Consequently, the LED does not
@@ -21,7 +22,7 @@
5 files changed, 36 insertions(+), 20 deletions(-)
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
-index 28ec7e8..644ea36 100644
+index 3e50a72..91affd5 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -4404,6 +4404,8 @@ __ieee80211_create_tpt_led_trigger(struct ieee80211_hw *hw,
@@ -110,10 +111,10 @@
-#endif
-}
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
-index 838085f..492f389 100644
+index 6d8ce15..a9fcc7a 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
-@@ -5047,7 +5047,7 @@ void ieee80211_rx_list(struct ieee80211_hw *hw, struct ieee80211_sta *pubsta,
+@@ -5048,7 +5048,7 @@ void ieee80211_rx_list(struct ieee80211_hw *hw, struct ieee80211_sta *pubsta,
if (skb) {
if ((status->flag & RX_FLAG_8023) ||
ieee80211_is_data_present(hdr->frame_control))
@@ -145,5 +146,5 @@
ieee80211_tx_8023(sdata, skb, sta, false);
--
-2.39.0
+2.18.0
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9900-mac80211-mtk-mask-kernel-version-limitation-and-fill.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9900-mac80211-mtk-mask-kernel-version-limitation-and-fill.patch
index 7495c0b..e6288ed 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9900-mac80211-mtk-mask-kernel-version-limitation-and-fill.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9900-mac80211-mtk-mask-kernel-version-limitation-and-fill.patch
@@ -1,7 +1,7 @@
-From 02d5d2c957efe75c9bd6a57c2644082c3b3e4e49 Mon Sep 17 00:00:00 2001
+From bad36168042569eb4c7ab6a549f7444a40e299c3 Mon Sep 17 00:00:00 2001
From: Sujuan Chen <sujuan.chen@mediatek.com>
Date: Fri, 11 Mar 2022 11:34:11 +0800
-Subject: [PATCH 9900/9902] mac80211: mtk: mask kernel version limitation and
+Subject: [PATCH 9900/9903] mac80211: mtk: mask kernel version limitation and
fill forward path in kernel 5.4
Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
@@ -13,7 +13,7 @@
4 files changed, 10 deletions(-)
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
-index 28ec7e8..9c35e0b 100644
+index 91affd5..42192cd 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -4307,13 +4307,11 @@ struct ieee80211_ops {
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9901-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-id.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9901-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-id.patch
index a9d2762..75abcb8 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9901-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-id.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9901-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-id.patch
@@ -1,7 +1,7 @@
-From c99c0ad9d8ec47c1a24cbe500cc016be9aa1cbe3 Mon Sep 17 00:00:00 2001
+From 0161154c18a464bbb350bcb5ef620bd255940640 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 9901/9902] mac80211: mtk: add fill receive path ops to get wed
+Subject: [PATCH 9901/9903] mac80211: mtk: add fill receive path ops to get wed
idx
Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
@@ -17,7 +17,7 @@
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
old mode 100644
new mode 100755
-index 9c35e0b..2ed355a
+index 42192cd..8a71026
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1798,6 +1798,13 @@ struct ieee80211_vif *wdev_to_ieee80211_vif(struct wireless_dev *wdev);
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9902-mac80211-mtk-add-support-for-letting-drivers-registe.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9902-mac80211-mtk-add-support-for-letting-drivers-registe.patch
index eebb33f..414693e 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9902-mac80211-mtk-add-support-for-letting-drivers-registe.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9902-mac80211-mtk-add-support-for-letting-drivers-registe.patch
@@ -1,7 +1,7 @@
-From 6132995c725ee7856c3fa1bd0415a10b56664c8e Mon Sep 17 00:00:00 2001
+From fdc7f27785b716eae1e02df73c095ecfe2677d9f Mon Sep 17 00:00:00 2001
From: Sujuan Chen <sujuan.chen@mediatek.com>
Date: Tue, 28 Mar 2023 10:53:31 +0800
-Subject: [PATCH 9902/9902] mac80211: mtk: add support for letting drivers
+Subject: [PATCH 9902/9903] mac80211: mtk: add support for letting drivers
register tc offload support
On newer MediaTek SoCs (e.g. MT7986), WLAN->WLAN or WLAN->Ethernet flows can
@@ -18,7 +18,7 @@
5 files changed, 70 insertions(+), 1 deletion(-)
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
-index 2ed355a..ba1a817 100755
+index 8a71026..861bc9a 100755
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -3984,6 +3984,10 @@ struct ieee80211_prep_tx_info {
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9903-mac80211-add-per-bss-flag-to-support-vendors-cou.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9903-mac80211-mtk-add-per-bss-flag-to-support-vendors-cou.patch
similarity index 91%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9903-mac80211-add-per-bss-flag-to-support-vendors-cou.patch
rename to autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9903-mac80211-mtk-add-per-bss-flag-to-support-vendors-cou.patch
index 9c3586c..cefbd2c 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9903-mac80211-add-per-bss-flag-to-support-vendors-cou.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9903-mac80211-mtk-add-per-bss-flag-to-support-vendors-cou.patch
@@ -1,7 +1,8 @@
-From 0d9e675842ae495da9412694f4dc6b3cfa897140 Mon Sep 17 00:00:00 2001
+From 26b093ef1b3bcbd168216ea4d94baedfb1dd5366 Mon Sep 17 00:00:00 2001
From: "sujuan.chen" <sujuan.chen@mediatek.com>
Date: Tue, 30 May 2023 15:36:33 +0800
-Subject: [PATCH] mtk: mac80211: add per-bss flag to support vendors counter
+Subject: [PATCH 9903/9903] mac80211: mtk: add per-bss flag to support vendors
+ counter
Signed-off-by: sujuan.chen <sujuan.chen@mediatek.com>
---
@@ -23,7 +24,7 @@
/* add new features before the definition below */
NUM_NL80211_EXT_FEATURES,
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
-index 838085f..e165ac6 100644
+index a9fcc7a..7304dbd 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -2641,7 +2641,9 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx)
@@ -37,7 +38,7 @@
if (rx->sta) {
/* The seqno index has the same property as needed
-@@ -4544,7 +4546,9 @@ static void ieee80211_rx_8023(struct ieee80211_rx_data *rx,
+@@ -4545,7 +4547,9 @@ static void ieee80211_rx_8023(struct ieee80211_rx_data *rx,
skb->dev = fast_rx->dev;
@@ -49,7 +50,7 @@
/* The seqno index has the same property as needed
* for the rx_msdu field, i.e. it is IEEE80211_NUM_TIDS
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
-index 9b66cc0..5fb51fc 100644
+index 50ba10c..e071130 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -3454,7 +3454,9 @@ ieee80211_xmit_fast_finish(struct ieee80211_sub_if_data *sdata,