diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
index 469d4264a..3b968f14e 100644
--- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
@@ -824,8 +824,10 @@ mac80211_setup_supplicant_noctl() {
mac80211_prepare_iw_htmode() {
case "$htmode" in
- VHT20|HT20|HE20) iw_htmode=HT20;;
- HT40*|VHT40|VHT160|HE40)
+ HT20|VHT20|HE20|EHT20)
+ iw_htmode=HT20
+ ;;
+ HT40*|VHT40|HE40|EHT40)
case "$band" in
2g)
case "$htmode" in
@@ -849,8 +851,11 @@ mac80211_prepare_iw_htmode() {
esac
[ "$auto_channel" -gt 0 ] && iw_htmode="HT40+"
;;
- VHT80|HE80)
- iw_htmode="80MHZ"
+ VHT80|HE80|EHT80)
+ iw_htmode="80MHz"
+ ;;
+ VHT160|HE160|EHT160)
+ iw_htmode="160MHz"
;;
NONE|NOHT)
iw_htmode="NOHT"
diff --git a/package/kernel/mac80211/patches/build/992-fix-tasklet_setup-build-kernel-5.4.patch b/package/kernel/mac80211/patches/build/992-fix-tasklet_setup-build-kernel-5.4.patch
index bb1e79dbe..c90aedd9e 100644
--- a/package/kernel/mac80211/patches/build/992-fix-tasklet_setup-build-kernel-5.4.patch
+++ b/package/kernel/mac80211/patches/build/992-fix-tasklet_setup-build-kernel-5.4.patch
@@ -1,6 +1,6 @@
--- a/backport-include/linux/interrupt.h
+++ b/backport-include/linux/interrupt.h
-@@ -43,7 +43,7 @@
+@@ -43,7 +43,7 @@ static inline void backport_hrtimer_star
#endif
diff --git a/package/kernel/mac80211/patches/build/993-add-new-EHT-TLV-definition-for-11be-standard.patch b/package/kernel/mac80211/patches/build/993-add-new-EHT-TLV-definition-for-11be-standard.patch
new file mode 100644
index 000000000..f324d9411
--- /dev/null
+++ b/package/kernel/mac80211/patches/build/993-add-new-EHT-TLV-definition-for-11be-standard.patch
@@ -0,0 +1,219 @@
+Signed-off-by: Mordechay Goodstein <mordechay.goodstein@intel.com>
+Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
+---
+ include/net/ieee80211_radiotap.h | 187 ++++++++++++++++++++++++++++++-
+ 1 file changed, 185 insertions(+), 2 deletions(-)
+
+--- a/include/net/ieee80211_radiotap.h
++++ b/include/net/ieee80211_radiotap.h
+@@ -1,6 +1,6 @@
+ /*
+ * Copyright (c) 2017 Intel Deutschland GmbH
+- * Copyright (c) 2018-2019, 2021 Intel Corporation
++ * Copyright (c) 2018-2019, 2021-2022 Intel Corporation
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+@@ -82,11 +82,14 @@ enum ieee80211_radiotap_presence {
+ IEEE80211_RADIOTAP_HE_MU = 24,
+ IEEE80211_RADIOTAP_ZERO_LEN_PSDU = 26,
+ IEEE80211_RADIOTAP_LSIG = 27,
++ IEEE80211_RADIOTAP_TLV = 28,
+
+ /* valid in every it_present bitmap, even vendor namespaces */
+ IEEE80211_RADIOTAP_RADIOTAP_NAMESPACE = 29,
+ IEEE80211_RADIOTAP_VENDOR_NAMESPACE = 30,
+- IEEE80211_RADIOTAP_EXT = 31
++ IEEE80211_RADIOTAP_EXT = 31,
++ IEEE80211_RADIOTAP_EHT_USIG = 33,
++ IEEE80211_RADIOTAP_EHT = 34,
+ };
+
+ /* for IEEE80211_RADIOTAP_FLAGS */
+@@ -360,6 +363,186 @@ enum ieee80211_radiotap_zero_len_psdu_ty
+ IEEE80211_RADIOTAP_ZERO_LEN_PSDU_VENDOR = 0xff,
+ };
+
++struct ieee80211_radiotap_tlv {
++ __le16 type;
++ __le16 len;
++ u8 data[];
++} __packed;
++
++/* ieee80211_radiotap_eht_usig - content of U-SIG tlv (type 33)
++ * see www.radiotap.org/fields/U-SIG.html for details
++ */
++struct ieee80211_radiotap_eht_usig {
++ __le32 common;
++ __le32 value;
++ __le32 mask;
++} __packed;
++
++/* ieee80211_radiotap_eht - content of EHT tlv (type 34)
++ * see www.radiotap.org/fields/EHT.html for details
++ */
++struct ieee80211_radiotap_eht {
++ __le32 known;
++ __le32 data[9];
++ __le32 user_info[];
++} __packed;
++
++/* Known field for EHT TLV
++ * The ending defines for what the field applies as following
++ * O - OFDMA (including TB), M - MU-MIMO, S - EHT sounding.
++ */
++enum ieee80211_radiotap_eht_known {
++ IEEE80211_RADIOTAP_EHT_KNOWN_SPATIAL_REUSE = 0x00000002,
++ IEEE80211_RADIOTAP_EHT_KNOWN_GI = 0x00000004,
++ IEEE80211_RADIOTAP_EHT_KNOWN_EHT_LTF = 0x00000010,
++ IEEE80211_RADIOTAP_EHT_KNOWN_LDPC_EXTRA_SYM_OM = 0x00000020,
++ IEEE80211_RADIOTAP_EHT_KNOWN_PRE_PADD_FACOR_OM = 0x00000040,
++ IEEE80211_RADIOTAP_EHT_KNOWN_PE_DISAMBIGUITY_OM = 0x00000080,
++ IEEE80211_RADIOTAP_EHT_KNOWN_DISREGARD_O = 0x00000100,
++ IEEE80211_RADIOTAP_EHT_KNOWN_DISREGARD_S = 0x00000200,
++ IEEE80211_RADIOTAP_EHT_KNOWN_CRC1 = 0x00002000,
++ IEEE80211_RADIOTAP_EHT_KNOWN_TAIL1 = 0x00004000,
++ IEEE80211_RADIOTAP_EHT_KNOWN_CRC2_O = 0x00008000,
++ IEEE80211_RADIOTAP_EHT_KNOWN_TAIL2_O = 0x00010000,
++ IEEE80211_RADIOTAP_EHT_KNOWN_NSS_S = 0x00020000,
++ IEEE80211_RADIOTAP_EHT_KNOWN_BEAMFORMED_S = 0x00040000,
++ IEEE80211_RADIOTAP_EHT_KNOWN_NR_NON_OFDMA_USERS_M = 0x00080000,
++ IEEE80211_RADIOTAP_EHT_KNOWN_ENCODING_BLOCK_CRC_M = 0x00100000,
++ IEEE80211_RADIOTAP_EHT_KNOWN_ENCODING_BLOCK_TAIL_M = 0x00200000,
++ IEEE80211_RADIOTAP_EHT_KNOWN_RU_MRU_SIZE_OM = 0x00400000,
++ IEEE80211_RADIOTAP_EHT_KNOWN_RU_MRU_INDEX_OM = 0x00800000,
++ IEEE80211_RADIOTAP_EHT_KNOWN_RU_ALLOC_TB_FMT = 0x01000000,
++ IEEE80211_RADIOTAP_EHT_KNOWN_PRIMARY_80 = 0x02000000,
++};
++
++enum ieee80211_radiotap_eht_data {
++ /* Data 0 */
++ IEEE80211_RADIOTAP_EHT_DATA0_SPATIAL_REUSE = 0x00000078,
++ IEEE80211_RADIOTAP_EHT_DATA0_GI = 0x00000180,
++ IEEE80211_RADIOTAP_EHT_DATA0_LTF = 0x00000600,
++ IEEE80211_RADIOTAP_EHT_DATA0_EHT_LTF = 0x00003800,
++ IEEE80211_RADIOTAP_EHT_DATA0_LDPC_EXTRA_SYM_OM = 0x00004000,
++ IEEE80211_RADIOTAP_EHT_DATA0_PRE_PADD_FACOR_OM = 0x00018000,
++ IEEE80211_RADIOTAP_EHT_DATA0_PE_DISAMBIGUITY_OM = 0x00020000,
++ IEEE80211_RADIOTAP_EHT_DATA0_DISREGARD_S = 0x000c0000,
++ IEEE80211_RADIOTAP_EHT_DATA0_DISREGARD_O = 0x003c0000,
++ IEEE80211_RADIOTAP_EHT_DATA0_CRC1_O = 0x03c00000,
++ IEEE80211_RADIOTAP_EHT_DATA0_TAIL1_O = 0xfc000000,
++ /* Data 1 */
++ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE = 0x0000001f,
++ IEEE80211_RADIOTAP_EHT_DATA1_RU_INDEX = 0x00001fe0,
++ IEEE80211_RADIOTAP_EHT_DATA1_RU_ALLOC_CC_1_1_1 = 0x003fe000,
++ IEEE80211_RADIOTAP_EHT_DATA1_RU_ALLOC_CC_1_1_1_KNOWN = 0x00400000,
++ IEEE80211_RADIOTAP_EHT_DATA1_PRIMARY_80 = 0xc0000000,
++ /* Data 2 */
++ IEEE80211_RADIOTAP_EHT_DATA2_RU_ALLOC_CC_2_1_1 = 0x000001ff,
++ IEEE80211_RADIOTAP_EHT_DATA2_RU_ALLOC_CC_2_1_1_KNOWN = 0x00000200,
++ IEEE80211_RADIOTAP_EHT_DATA2_RU_ALLOC_CC_1_1_2 = 0x0007fc00,
++ IEEE80211_RADIOTAP_EHT_DATA2_RU_ALLOC_CC_1_1_2_KNOWN = 0x00080000,
++ IEEE80211_RADIOTAP_EHT_DATA2_RU_ALLOC_CC_2_1_2 = 0x1ff00000,
++ IEEE80211_RADIOTAP_EHT_DATA2_RU_ALLOC_CC_2_1_2_KNOWN = 0x20000000,
++ /* Data 3 */
++ IEEE80211_RADIOTAP_EHT_DATA3_RU_ALLOC_CC_1_2_1 = 0x000001ff,
++ IEEE80211_RADIOTAP_EHT_DATA3_RU_ALLOC_CC_1_2_1_KNOWN = 0x00000200,
++ IEEE80211_RADIOTAP_EHT_DATA3_RU_ALLOC_CC_2_2_1 = 0x0007fc00,
++ IEEE80211_RADIOTAP_EHT_DATA3_RU_ALLOC_CC_2_2_1_KNOWN = 0x00080000,
++ IEEE80211_RADIOTAP_EHT_DATA3_RU_ALLOC_CC_1_2_2 = 0x1ff00000,
++ IEEE80211_RADIOTAP_EHT_DATA3_RU_ALLOC_CC_1_2_2_KNOWN = 0x20000000,
++ /* Data 4 */
++ IEEE80211_RADIOTAP_EHT_DATA4_RU_ALLOC_CC_2_2_2 = 0x000001ff,
++ IEEE80211_RADIOTAP_EHT_DATA4_RU_ALLOC_CC_2_2_2_KNOWN = 0x00000200,
++ IEEE80211_RADIOTAP_EHT_DATA4_RU_ALLOC_CC_1_2_3 = 0x0007fc00,
++ IEEE80211_RADIOTAP_EHT_DATA4_RU_ALLOC_CC_1_2_3_KNOWN = 0x00080000,
++ IEEE80211_RADIOTAP_EHT_DATA4_RU_ALLOC_CC_2_2_3 = 0x1ff00000,
++ IEEE80211_RADIOTAP_EHT_DATA4_RU_ALLOC_CC_2_2_3_KNOWN = 0x20000000,
++ /* Data 5 */
++ IEEE80211_RADIOTAP_EHT_DATA5_RU_ALLOC_CC_1_2_4 = 0x000001ff,
++ IEEE80211_RADIOTAP_EHT_DATA5_RU_ALLOC_CC_1_2_4_KNOWN = 0x00000200,
++ IEEE80211_RADIOTAP_EHT_DATA5_RU_ALLOC_CC_2_2_4 = 0x0007fc00,
++ IEEE80211_RADIOTAP_EHT_DATA5_RU_ALLOC_CC_2_2_4_KNOWN = 0x00080000,
++ IEEE80211_RADIOTAP_EHT_DATA5_RU_ALLOC_CC_1_2_5 = 0x1ff00000,
++ IEEE80211_RADIOTAP_EHT_DATA5_RU_ALLOC_CC_1_2_5_KNOWN = 0x20000000,
++ /* Data 6 */
++ IEEE80211_RADIOTAP_EHT_DATA6_RU_ALLOC_CC_2_2_5 = 0x000001ff,
++ IEEE80211_RADIOTAP_EHT_DATA6_RU_ALLOC_CC_2_2_5_KNOWN = 0x00000200,
++ IEEE80211_RADIOTAP_EHT_DATA6_RU_ALLOC_CC_1_2_6 = 0x0007fc00,
++ IEEE80211_RADIOTAP_EHT_DATA6_RU_ALLOC_CC_1_2_6_KNOWN = 0x00080000,
++ IEEE80211_RADIOTAP_EHT_DATA6_RU_ALLOC_CC_2_2_6 = 0x1ff00000,
++ IEEE80211_RADIOTAP_EHT_DATA6_RU_ALLOC_CC_2_2_6_KNOWN = 0x20000000,
++ /* Data 7 */
++ IEEE80211_RADIOTAP_EHT_DATA7_CRC2_O = 0x0000000f,
++ IEEE80211_RADIOTAP_EHT_DATA7_TAIL_2_O = 0x000003f0,
++ IEEE80211_RADIOTAP_EHT_DATA7_NSS_S = 0x0000f000,
++ IEEE80211_RADIOTAP_EHT_DATA7_BEAMFORMED_S = 0x00010000,
++ IEEE80211_RADIOTAP_EHT_DATA7_NUM_OF_NON_OFDMA_USERS = 0x000e0000,
++ IEEE80211_RADIOTAP_EHT_DATA7_USER_ENCODING_BLOCK_CRC = 0x00f00000,
++ IEEE80211_RADIOTAP_EHT_DATA7_USER_ENCODING_BLOCK_TAIL = 0x3f000000,
++ /* Data 8 */
++ IEEE80211_RADIOTAP_EHT_DATA8_RU_ALLOC_TB_FMT_PS_160 = 0x00000001,
++ IEEE80211_RADIOTAP_EHT_DATA8_RU_ALLOC_TB_FMT_B0 = 0x00000002,
++ IEEE80211_RADIOTAP_EHT_DATA8_RU_ALLOC_TB_FMT_B7_B1 = 0x000001fc,
++};
++
++enum ieee80211_radiotap_eht_user_info {
++ IEEE80211_RADIOTAP_EHT_USER_INFO_STA_ID_KNOWN = 0x00000001,
++ IEEE80211_RADIOTAP_EHT_USER_INFO_MCS_KNOWN = 0x00000002,
++ IEEE80211_RADIOTAP_EHT_USER_INFO_CODING_KNOWN = 0x00000004,
++ IEEE80211_RADIOTAP_EHT_USER_INFO_NSS_KNOWN_O = 0x00000010,
++ IEEE80211_RADIOTAP_EHT_USER_INFO_BEAMFORMING_KNOWN_O = 0x00000020,
++ IEEE80211_RADIOTAP_EHT_USER_INFO_SPATIAL_CONFIG_KNOWN_M = 0x00000040,
++ IEEE80211_RADIOTAP_EHT_USER_INFO_DATA_FOR_USER = 0x00000080,
++ IEEE80211_RADIOTAP_EHT_USER_INFO_STA_ID = 0x0007ff00,
++ IEEE80211_RADIOTAP_EHT_USER_INFO_CODING = 0x00080000,
++ IEEE80211_RADIOTAP_EHT_USER_INFO_MCS = 0x00f00000,
++ IEEE80211_RADIOTAP_EHT_USER_INFO_NSS_O = 0x0f000000,
++ IEEE80211_RADIOTAP_EHT_USER_INFO_BEAMFORMING_O = 0x20000000,
++ IEEE80211_RADIOTAP_EHT_USER_INFO_SPATIAL_CONFIG_M = 0x3f000000,
++ IEEE80211_RADIOTAP_EHT_USER_INFO_RESEVED_c0000000 = 0xc0000000,
++};
++
++enum ieee80211_radiotap_eht_usig_common {
++ IEEE80211_RADIOTAP_EHT_USIG_COMMON_PHY_VER_KNOWN = 0x00000001,
++ IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW_KNOWN = 0x00000002,
++ IEEE80211_RADIOTAP_EHT_USIG_COMMON_UL_DL_KNOWN = 0x00000004,
++ IEEE80211_RADIOTAP_EHT_USIG_COMMON_BSS_COLOR_KNOWN = 0x00000008,
++ IEEE80211_RADIOTAP_EHT_USIG_COMMON_TXOP_KNOWN = 0x00000010,
++ IEEE80211_RADIOTAP_EHT_USIG_COMMON_BAD_USIG_CRC = 0x00000020,
++ IEEE80211_RADIOTAP_EHT_USIG_COMMON_PHY_VER = 0x00007000,
++ IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW = 0x00038000,
++ IEEE80211_RADIOTAP_EHT_USIG_COMMON_UL_DL = 0x00040000,
++ IEEE80211_RADIOTAP_EHT_USIG_COMMON_BSS_COLOR = 0x01f80000,
++ IEEE80211_RADIOTAP_EHT_USIG_COMMON_TXOP = 0xfe000000,
++};
++
++enum ieee80211_radiotap_eht_usig_mu {
++ /* MU-USIG-1 */
++ IEEE80211_RADIOTAP_EHT_USIG1_MU_B20_B24_DISREGARD = 0x0000001f,
++ IEEE80211_RADIOTAP_EHT_USIG1_MU_B25_VALIDATE = 0x00000020,
++ /* MU-USIG-2 */
++ IEEE80211_RADIOTAP_EHT_USIG2_MU_B0_B1_PPDU_TYPE = 0x000000c0,
++ IEEE80211_RADIOTAP_EHT_USIG2_MU_B2_VALIDATE = 0x00000100,
++ IEEE80211_RADIOTAP_EHT_USIG2_MU_B3_B7_PUNCTURED_INFO = 0x00003e00,
++ IEEE80211_RADIOTAP_EHT_USIG2_MU_B8_VALIDATE = 0x00004000,
++ IEEE80211_RADIOTAP_EHT_USIG2_MU_B9_B10_SIG_MCS = 0x00018000,
++ IEEE80211_RADIOTAP_EHT_USIG2_MU_B11_B15_EHT_SIG_SYMBOLS = 0x003e0000,
++ IEEE80211_RADIOTAP_EHT_USIG2_MU_B16_B19_CRC = 0x03c00000,
++ IEEE80211_RADIOTAP_EHT_USIG2_MU_B20_B25_TAIL = 0xfc000000,
++};
++
++enum ieee80211_radiotap_eht_usig_tb {
++ /* TB-USIG-1 */
++ IEEE80211_RADIOTAP_EHT_USIG1_TB_B20_B25_DISREGARD = 0x0000001f,
++
++ /* TB-USIG-2 */
++ IEEE80211_RADIOTAP_EHT_USIG2_TB_B0_B1_PPDU_TYPE = 0x000000c0,
++ IEEE80211_RADIOTAP_EHT_USIG2_TB_B2_VALIDATE = 0x00000100,
++ IEEE80211_RADIOTAP_EHT_USIG2_TB_B3_B6_SPATIAL_REUSE_1 = 0x00001e00,
++ IEEE80211_RADIOTAP_EHT_USIG2_TB_B7_B10_SPATIAL_REUSE_2 = 0x0001e000,
++ IEEE80211_RADIOTAP_EHT_USIG2_TB_B11_B15_DISREGARD = 0x003e0000,
++ IEEE80211_RADIOTAP_EHT_USIG2_TB_B16_B19_CRC = 0x03c00000,
++ IEEE80211_RADIOTAP_EHT_USIG2_TB_B20_B25_TAIL = 0xfc000000,
++};
++
+ /**
+ * ieee80211_get_radiotap_len - get radiotap header length
+ */