netlink: implement new identifiers from Linux 6.2 kernel

5 files changed, 373 insertions, 11 deletions

diff --git a/epan/dissectors/packet-netlink-generic.c b/epan/dissectors/packet-netlink-generic.c
index b0ee9194d4..90b85956b9 100644
--- a/epan/dissectors/packet-netlink-generic.c
+++ b/epan/dissectors/packet-netlink-generic.c
@@ -47,7 +47,9 @@ enum {
 	WS_CTRL_CMD_NEWMCAST_GRP,
 	WS_CTRL_CMD_DELMCAST_GRP,
 	WS_CTRL_CMD_GETMCAST_GRP,
+	WS_CTRL_CMD_GETPOLICY,
 };
+
 enum ws_genl_ctrl_attr {
 	WS_CTRL_ATTR_UNSPEC,
 	WS_CTRL_ATTR_FAMILY_ID,
@@ -57,6 +59,9 @@ enum ws_genl_ctrl_attr {
 	WS_CTRL_ATTR_MAXATTR,
 	WS_CTRL_ATTR_OPS,
 	WS_CTRL_ATTR_MCAST_GROUPS,
+	WS_CTRL_ATTR_POLICY,
+	WS_CTRL_ATTR_OP_POLICY,
+	WS_CTRL_ATTR_OP,
 };
 
 enum ws_genl_ctrl_op_attr {
@@ -85,6 +90,7 @@ static const value_string genl_ctrl_cmds[] = {
 	{ WS_CTRL_CMD_NEWMCAST_GRP,     "CTRL_CMD_NEWMCAST_GRP" },
 	{ WS_CTRL_CMD_DELMCAST_GRP,     "CTRL_CMD_DELMCAST_GRP" },
 	{ WS_CTRL_CMD_GETMCAST_GRP,     "CTRL_CMD_GETMCAST_GRP" },
+	{ WS_CTRL_CMD_GETPOLICY,        "CTRL_CMD_GETPOLICY" },
 	{ 0, NULL }
 };
 
@@ -97,6 +103,9 @@ static const value_string genl_ctrl_attr_vals[] = {
 	{ WS_CTRL_ATTR_MAXATTR,         "CTRL_ATTR_MAXATTR" },
 	{ WS_CTRL_ATTR_OPS,             "CTRL_ATTR_OPS" },
 	{ WS_CTRL_ATTR_MCAST_GROUPS,    "CTRL_ATTR_MCAST_GROUPS" },
+	{ WS_CTRL_ATTR_POLICY,          "CTRL_ATTR_POLICY" },
+	{ WS_CTRL_ATTR_OP_POLICY,       "CTRL_ATTR_OP_POLICY" },
+	{ WS_CTRL_ATTR_OP,              "CTRL_ATTR_OP" },
 	{ 0, NULL }
 };
 
@@ -280,6 +289,10 @@ dissect_genl_ctrl_attrs(tvbuff_t *tvb, void *data, struct packet_netlink_data *n
 	case WS_CTRL_ATTR_MCAST_GROUPS:
 		offset = dissect_netlink_attributes_array(tvb, hf_genl_ctrl_groups_attr, ett_genl_ctrl_groups, ett_genl_ctrl_groups_attr, info, nl_data, tree, offset, len, dissect_genl_ctrl_groups_attrs);
 		break;
+	case WS_CTRL_ATTR_POLICY:
+	case WS_CTRL_ATTR_OP_POLICY:
+	case WS_CTRL_ATTR_OP:
+		break;
 	}
 
 	return offset;
diff --git a/epan/dissectors/packet-netlink-netfilter.c b/epan/dissectors/packet-netlink-netfilter.c
index ad3bb36396..c0ddcb164a 100644
--- a/epan/dissectors/packet-netlink-netfilter.c
+++ b/epan/dissectors/packet-netlink-netfilter.c
@@ -41,7 +41,8 @@ enum {
 	WS_NFNL_SUBSYS_CTHELPER          =  9,
 	WS_NFNL_SUBSYS_NFTABLES          = 10,
 	WS_NFNL_SUBSYS_NFT_COMPAT        = 11,
-	WS_NFNL_SUBSYS_COUNT             = 12,
+	WS_NFNL_SUBSYS_HOOK              = 12,
+	WS_NFNL_SUBSYS_COUNT             = 13,
 };
 
 /* nfnetlink ULOG subsystem types from <include/uapi/linux/netfilter/nfnetlink_log.h> */
@@ -66,6 +67,7 @@ enum ws_nf_inet_hooks {
 	WS_NF_INET_FORWARD      = 2,
 	WS_NF_INET_LOCAL_OUT    = 3,
 	WS_NF_INET_POST_ROUTING = 4,
+	WS_NF_INET_NUMHOOKS     = 5,
 };
 
 /* from <include/uapi/linux/netfilter/nf_conntrack_common.h> */
@@ -154,6 +156,7 @@ enum ws_nfqnl_attr_type {
 	WS_NFQA_SECCTX              = 18,
 	WS_NFQA_VLAN                = 19,
 	WS_NFQA_L2HDR               = 20,
+	WS_NFQA_PRIORITY            = 21,
 };
 
 enum ws_nfqnl_msg_config_cmds {
@@ -262,6 +265,8 @@ enum ws_ctattr_type {
 	WS_CTA_LABELS               = 22,
 	WS_CTA_LABELS_MASK          = 23,
 	WS_CTA_SYNPROXY             = 24,
+	WS_CTA_FILTER               = 25,
+	WS_CTA_STATUS_MASK          = 26,
 };
 
 enum ws_ctattr_help {
@@ -325,13 +330,14 @@ enum ws_ipset_cadt_attr {
 	WS_IPSET_ATTR_CADT_LINENO       = 9,
 	WS_IPSET_ATTR_MARK              = 10,
 	WS_IPSET_ATTR_MARKMASK          = 11,
+	WS_IPSET_ATTR_BITMASK           = 12,
 	/* (reserved up to 16) */
 #define WS_IPSET_ATTR_CADT_MAX            16
-	WS_IPSET_ATTR_GC                = 17,
+	WS_IPSET_ATTR_INITVAL           = 17,
 	WS_IPSET_ATTR_HASHSIZE          = 18,
 	WS_IPSET_ATTR_MAXELEM           = 19,
 	WS_IPSET_ATTR_NETMASK           = 20,
-	WS_IPSET_ATTR_PROBES            = 21,
+	WS_IPSET_ATTR_BUCKETSIZE        = 21,
 	WS_IPSET_ATTR_RESIZE            = 22,
 	WS_IPSET_ATTR_SIZE              = 23,
 	WS_IPSET_ATTR_ELEMENTS          = 24,
@@ -622,6 +628,8 @@ static const value_string nfct_attr_vals[] = {
 	{ WS_CTA_LABELS,                "LABELS" },
 	{ WS_CTA_LABELS_MASK,           "LABELS_MASK" },
 	{ WS_CTA_SYNPROXY,              "SYNPROXY" },
+	{ WS_CTA_FILTER,                "FILTER" },
+	{ WS_CTA_STATUS_MASK,           "STATUS_MASK" },
 	{ 0, NULL }
 };
 
@@ -1002,6 +1010,7 @@ static const value_string nfq_attr_vals[] = {
 	{ WS_NFQA_SECCTX,               "Security context string" },
 	{ WS_NFQA_VLAN,                 "Packet VLAN info" },
 	{ WS_NFQA_L2HDR,                "Full L2 header" },
+	{ WS_NFQA_PRIORITY,             "Priority" },
 	{ 0, NULL }
 };
 
@@ -1021,6 +1030,7 @@ const value_string netfilter_hooks_vals[] = {
 	{ WS_NF_INET_FORWARD,       "Forward" },
 	{ WS_NF_INET_LOCAL_OUT,     "Local out" },
 	{ WS_NF_INET_POST_ROUTING,  "Post-routing" },
+	{ WS_NF_INET_NUMHOOKS,      "Number of hooks" },
 	{ 0, NULL }
 };
 
@@ -1191,6 +1201,7 @@ dissect_nfq_attrs(tvbuff_t *tvb, void *data, struct packet_netlink_data *nl_data
 		case WS_NFQA_SECCTX:
 		case WS_NFQA_VLAN:
 		case WS_NFQA_L2HDR:
+		case WS_NFQA_PRIORITY:
 			/* TODO */
 			break;
 	}
@@ -1301,12 +1312,13 @@ static const value_string ipset_cadt_attr_vals[] = {
 	{ WS_IPSET_ATTR_CADT_LINENO,    "CADT_LINENO" },
 	{ WS_IPSET_ATTR_MARK,           "MARK" },
 	{ WS_IPSET_ATTR_MARKMASK,       "MARKMASK" },
+	{ WS_IPSET_ATTR_BITMASK,        "BITMASK" },
 	/* up to 16 is reserved. */
-	{ WS_IPSET_ATTR_GC,             "GC" },
+	{ WS_IPSET_ATTR_INITVAL,        "INITVAL" },
 	{ WS_IPSET_ATTR_HASHSIZE,       "HASHSIZE" },
 	{ WS_IPSET_ATTR_MAXELEM,        "MAXELEM" },
 	{ WS_IPSET_ATTR_NETMASK,        "NETMASK" },
-	{ WS_IPSET_ATTR_PROBES,         "PROBES" },
+	{ WS_IPSET_ATTR_BUCKETSIZE,     "BUCKETSIZE" },
 	{ WS_IPSET_ATTR_RESIZE,         "RESIZE" },
 	{ WS_IPSET_ATTR_SIZE,           "SIZE" },
 	{ WS_IPSET_ATTR_ELEMENTS,       "ELEMENTS" },
@@ -1417,11 +1429,12 @@ dissect_ipset_cadt_attrs(tvbuff_t *tvb, void *data, struct packet_netlink_data *
 		case WS_IPSET_ATTR_CADT_LINENO:
 		case WS_IPSET_ATTR_MARK:
 		case WS_IPSET_ATTR_MARKMASK:
-		case WS_IPSET_ATTR_GC:
+		case WS_IPSET_ATTR_BITMASK:
+		case WS_IPSET_ATTR_INITVAL:
 		case WS_IPSET_ATTR_HASHSIZE:
 		case WS_IPSET_ATTR_MAXELEM:
 		case WS_IPSET_ATTR_NETMASK:
-		case WS_IPSET_ATTR_PROBES:
+		case WS_IPSET_ATTR_BUCKETSIZE:
 		case WS_IPSET_ATTR_RESIZE:
 		case WS_IPSET_ATTR_SIZE:
 		case WS_IPSET_ATTR_ELEMENTS:
@@ -1550,6 +1563,7 @@ static const value_string netlink_netfilter_subsystem_vals[] = {
 	{ WS_NFNL_SUBSYS_CTHELPER,          "Connection Tracking Helpers" },
 	{ WS_NFNL_SUBSYS_NFTABLES,          "Netfilter tables" },
 	{ WS_NFNL_SUBSYS_NFT_COMPAT,        "x_tables compatibility layer for nf_tables" },
+	{ WS_NFNL_SUBSYS_HOOK,              "Hook" },
 	{ WS_NFNL_SUBSYS_COUNT,             "Count" },
 	{ 0, NULL }
 };
diff --git a/epan/dissectors/packet-netlink-nl80211.c b/epan/dissectors/packet-netlink-nl80211.c
index 410d01eba9..77b461ad9d 100644
--- a/epan/dissectors/packet-netlink-nl80211.c
+++ b/epan/dissectors/packet-netlink-nl80211.c
@@ -167,6 +167,22 @@ enum ws_nl80211_commands {
     WS_NL80211_CMD_NOTIFY_RADAR,
     WS_NL80211_CMD_UPDATE_OWE_INFO,
     WS_NL80211_CMD_PROBE_MESH_LINK,
+    WS_NL80211_CMD_SET_TID_CONFIG,
+    WS_NL80211_CMD_UNPROT_BEACON,
+    WS_NL80211_CMD_CONTROL_PORT_FRAME_TX_STATUS,
+    WS_NL80211_CMD_SET_SAR_SPECS,
+    WS_NL80211_CMD_OBSS_COLOR_COLLISION,
+    WS_NL80211_CMD_COLOR_CHANGE_REQUEST,
+    WS_NL80211_CMD_COLOR_CHANGE_STARTED,
+    WS_NL80211_CMD_COLOR_CHANGE_ABORTED,
+    WS_NL80211_CMD_COLOR_CHANGE_COMPLETED,
+    WS_NL80211_CMD_SET_FILS_AAD,
+    WS_NL80211_CMD_ASSOC_COMEBACK,
+    WS_NL80211_CMD_ADD_LINK,
+    WS_NL80211_CMD_REMOVE_LINK,
+    WS_NL80211_CMD_ADD_LINK_STA,
+    WS_NL80211_CMD_MODIFY_LINK_STA,
+    WS_NL80211_CMD_REMOVE_LINK_STA,
 };
 
 enum ws_nl80211_attrs {
@@ -356,8 +372,8 @@ enum ws_nl80211_attrs {
     WS_NL80211_ATTR_CH_SWITCH_COUNT,
     WS_NL80211_ATTR_CH_SWITCH_BLOCK_TX,
     WS_NL80211_ATTR_CSA_IES,
-    WS_NL80211_ATTR_CSA_C_OFF_BEACON,
-    WS_NL80211_ATTR_CSA_C_OFF_PRESP,
+    WS_NL80211_ATTR_CNTDWN_OFFS_BEACON,
+    WS_NL80211_ATTR_CNTDWN_OFFS_PRESP,
     WS_NL80211_ATTR_RXMGMT_FLAGS,
     WS_NL80211_ATTR_STA_SUPPORTED_CHANNELS,
     WS_NL80211_ATTR_STA_SUPPORTED_OPER_CLASSES,
@@ -452,6 +468,47 @@ enum ws_nl80211_attrs {
     WS_NL80211_ATTR_HE_OBSS_PD,
     WS_NL80211_ATTR_WIPHY_EDMG_CHANNELS,
     WS_NL80211_ATTR_WIPHY_EDMG_BW_CONFIG,
+    WS_NL80211_ATTR_VLAN_ID,
+    WS_NL80211_ATTR_HE_BSS_COLOR,
+    WS_NL80211_ATTR_IFTYPE_AKM_SUITES,
+    WS_NL80211_ATTR_TID_CONFIG,
+    WS_NL80211_ATTR_CONTROL_PORT_NO_PREAUTH,
+    WS_NL80211_ATTR_PMK_LIFETIME,
+    WS_NL80211_ATTR_PMK_REAUTH_THRESHOLD,
+    WS_NL80211_ATTR_RECEIVE_MULTICAST,
+    WS_NL80211_ATTR_WIPHY_FREQ_OFFSET,
+    WS_NL80211_ATTR_CENTER_FREQ1_OFFSET,
+    WS_NL80211_ATTR_SCAN_FREQ_KHZ,
+    WS_NL80211_ATTR_HE_6GHZ_CAPABILITY,
+    WS_NL80211_ATTR_FILS_DISCOVERY,
+    WS_NL80211_ATTR_UNSOL_BCAST_PROBE_RESP,
+    WS_NL80211_ATTR_S1G_CAPABILITY,
+    WS_NL80211_ATTR_S1G_CAPABILITY_MASK,
+    WS_NL80211_ATTR_SAE_PWE,
+    WS_NL80211_ATTR_RECONNECT_REQUESTED,
+    WS_NL80211_ATTR_SAR_SPEC,
+    WS_NL80211_ATTR_DISABLE_HE,
+    WS_NL80211_ATTR_OBSS_COLOR_BITMAP,
+    WS_NL80211_ATTR_COLOR_CHANGE_COUNT,
+    WS_NL80211_ATTR_COLOR_CHANGE_COLOR,
+    WS_NL80211_ATTR_COLOR_CHANGE_ELEMS,
+    WS_NL80211_ATTR_MBSSID_CONFIG,
+    WS_NL80211_ATTR_MBSSID_ELEMS,
+    WS_NL80211_ATTR_RADAR_BACKGROUND,
+    WS_NL80211_ATTR_AP_SETTINGS_FLAGS,
+    WS_NL80211_ATTR_EHT_CAPABILITY,
+    WS_NL80211_ATTR_DISABLE_EHT,
+    WS_NL80211_ATTR_MLO_LINKS,
+    WS_NL80211_ATTR_MLO_LINK_ID,
+    WS_NL80211_ATTR_MLD_ADDR,
+    WS_NL80211_ATTR_MLO_SUPPORT,
+    WS_NL80211_ATTR_MAX_NUM_AKM_SUITES,
+    WS_NL80211_ATTR_EML_CAPABILITY,
+    WS_NL80211_ATTR_MLD_CAPA_AND_OPS,
+    WS_NL80211_ATTR_TX_HW_TIMESTAMP,
+    WS_NL80211_ATTR_RX_HW_TIMESTAMP,
+    WS_NL80211_ATTR_TD_BITMAP,
+    WS_NL80211_ATTR_PUNCT_BITMAP,
 };
 
 enum ws_nl80211_iftype {
@@ -521,6 +578,11 @@ enum ws_nl80211_rate_info {
     WS_NL80211_RATE_INFO_HE_GI,
     WS_NL80211_RATE_INFO_HE_DCM,
     WS_NL80211_RATE_INFO_HE_RU_ALLOC,
+    WS_NL80211_RATE_INFO_320_MHZ_WIDTH,
+    WS_NL80211_RATE_INFO_EHT_MCS,
+    WS_NL80211_RATE_INFO_EHT_NSS,
+    WS_NL80211_RATE_INFO_EHT_GI,
+    WS_NL80211_RATE_INFO_EHT_RU_ALLOC,
 };
 
 enum ws_nl80211_sta_bss_param {
@@ -576,6 +638,7 @@ enum ws_nl80211_sta_info {
     WS_NL80211_STA_INFO_AIRTIME_WEIGHT,
     WS_NL80211_STA_INFO_AIRTIME_LINK_METRIC,
     WS_NL80211_STA_INFO_ASSOC_AT_BOOTTIME,
+    WS_NL80211_STA_INFO_CONNECTED_TO_AS,
 };
 
 enum ws_nl80211_tid_stats {
@@ -631,6 +694,12 @@ enum ws_nl80211_band_iftype_attr {
     WS_NL80211_BAND_IFTYPE_ATTR_HE_CAP_PHY,
     WS_NL80211_BAND_IFTYPE_ATTR_HE_CAP_MCS_SET,
     WS_NL80211_BAND_IFTYPE_ATTR_HE_CAP_PPE,
+    WS_NL80211_BAND_IFTYPE_ATTR_HE_6GHZ_CAPA,
+    WS_NL80211_BAND_IFTYPE_ATTR_VENDOR_ELEMS,
+    WS_NL80211_BAND_IFTYPE_ATTR_EHT_CAP_MAC,
+    WS_NL80211_BAND_IFTYPE_ATTR_EHT_CAP_PHY,
+    WS_NL80211_BAND_IFTYPE_ATTR_EHT_CAP_MCS_SET,
+    WS_NL80211_BAND_IFTYPE_ATTR_EHT_CAP_PPE,
 };
 
 enum ws_nl80211_band_attr {
@@ -676,6 +745,15 @@ enum ws_nl80211_frequency_attr {
     WS_NL80211_FREQUENCY_ATTR_NO_20MHZ,
     WS_NL80211_FREQUENCY_ATTR_NO_10MHZ,
     WS_NL80211_FREQUENCY_ATTR_WMM,
+    WS_NL80211_FREQUENCY_ATTR_NO_HE,
+    WS_NL80211_FREQUENCY_ATTR_OFFSET,
+    WS_NL80211_FREQUENCY_ATTR_1MHZ,
+    WS_NL80211_FREQUENCY_ATTR_2MHZ,
+    WS_NL80211_FREQUENCY_ATTR_4MHZ,
+    WS_NL80211_FREQUENCY_ATTR_8MHZ,
+    WS_NL80211_FREQUENCY_ATTR_16MHZ,
+    WS_NL80211_FREQUENCY_ATTR_NO_320MHZ,
+    WS_NL80211_FREQUENCY_ATTR_NO_EHT,
 };
 
 enum ws_nl80211_bitrate_attr {
@@ -735,6 +813,8 @@ enum ws_nl80211_reg_rule_flags {
     WS_NL80211_RRF_NO_HT40PLUS = 1<<14,
     WS_NL80211_RRF_NO_80MHZ = 1<<15,
     WS_NL80211_RRF_NO_160MHZ = 1<<16,
+    WS_NL80211_RRF_NO_HE = 1<<17,
+    WS_NL80211_RRF_NO_320MHZ = 1<<18,
 };
 
 enum ws_nl80211_dfs_regions {
@@ -763,6 +843,7 @@ enum ws_nl80211_survey_info {
     WS_NL80211_SURVEY_INFO_TIME_SCAN,
     WS_NL80211_SURVEY_INFO_PAD,
     WS_NL80211_SURVEY_INFO_TIME_BSS_RX,
+    WS_NL80211_SURVEY_INFO_FREQUENCY_OFFSET,
 };
 
 enum ws_nl80211_mntr_flags {
@@ -813,6 +894,8 @@ enum ws_nl80211_meshconf_params {
     WS_NL80211_MESHCONF_AWAKE_WINDOW,
     WS_NL80211_MESHCONF_PLINK_TIMEOUT,
     WS_NL80211_MESHCONF_CONNECTED_TO_GATE,
+    WS_NL80211_MESHCONF_NOLEARN,
+    WS_NL80211_MESHCONF_CONNECTED_TO_AS,
 };
 
 enum ws_nl80211_mesh_setup_params {
@@ -866,12 +949,20 @@ enum ws_nl80211_chan_width {
     WS_NL80211_CHAN_WIDTH_160,
     WS_NL80211_CHAN_WIDTH_5,
     WS_NL80211_CHAN_WIDTH_10,
+    WS_NL80211_CHAN_WIDTH_1,
+    WS_NL80211_CHAN_WIDTH_2,
+    WS_NL80211_CHAN_WIDTH_4,
+    WS_NL80211_CHAN_WIDTH_8,
+    WS_NL80211_CHAN_WIDTH_16,
+    WS_NL80211_CHAN_WIDTH_320,
 };
 
 enum ws_nl80211_bss_scan_width {
     WS_NL80211_BSS_CHAN_WIDTH_20,
     WS_NL80211_BSS_CHAN_WIDTH_10,
     WS_NL80211_BSS_CHAN_WIDTH_5,
+    WS_NL80211_BSS_CHAN_WIDTH_1,
+    WS_NL80211_BSS_CHAN_WIDTH_2,
 };
 
 enum ws_nl80211_bss {
@@ -895,6 +986,9 @@ enum ws_nl80211_bss {
     WS_NL80211_BSS_PARENT_TSF,
     WS_NL80211_BSS_PARENT_BSSID,
     WS_NL80211_BSS_CHAIN_SIGNAL,
+    WS_NL80211_BSS_FREQUENCY_OFFSET,
+    WS_NL80211_BSS_MLO_LINK_ID,
+    WS_NL80211_BSS_MLD_ADDR,
 };
 
 enum ws_nl80211_bss_status {
@@ -949,6 +1043,7 @@ enum ws_nl80211_key_attributes {
     WS_NL80211_KEY_TYPE,
     WS_NL80211_KEY_DEFAULT_TYPES,
     WS_NL80211_KEY_MODE,
+    WS_NL80211_KEY_DEFAULT_BEACON,
 };
 
 enum ws_nl80211_tx_rate_attributes {
@@ -957,6 +1052,9 @@ enum ws_nl80211_tx_rate_attributes {
     WS_NL80211_TXRATE_HT,
     WS_NL80211_TXRATE_VHT,
     WS_NL80211_TXRATE_GI,
+    WS_NL80211_TXRATE_HE,
+    WS_NL80211_TXRATE_HE_GI,
+    WS_NL80211_TXRATE_HE_LTF,
 };
 
 enum ws_nl80211_txrate_gi {
@@ -970,6 +1068,8 @@ enum ws_nl80211_band {
     WS_NL80211_BAND_5GHZ,
     WS_NL80211_BAND_60GHZ,
     WS_NL80211_BAND_6GHZ,
+    WS_NL80211_BAND_S1GHZ,
+    WS_NL80211_BAND_LC,
 };
 
 enum ws_nl80211_ps_state {
@@ -1097,6 +1197,7 @@ enum ws_nl80211_rekey_data {
     WS_NL80211_REKEY_DATA_KEK,
     WS_NL80211_REKEY_DATA_KCK,
     WS_NL80211_REKEY_DATA_REPLAY_CTR,
+    WS_NL80211_REKEY_DATA_AKM,
 };
 
 enum ws_nl80211_hidden_ssid {
@@ -1200,6 +1301,31 @@ enum ws_nl80211_ext_feature_index {
     WS_NL80211_EXT_FEATURE_EXT_KEY_ID,
     WS_NL80211_EXT_FEATURE_STA_TX_PWR,
     WS_NL80211_EXT_FEATURE_SAE_OFFLOAD,
+    WS_NL80211_EXT_FEATURE_VLAN_OFFLOAD,
+    WS_NL80211_EXT_FEATURE_AQL,
+    WS_NL80211_EXT_FEATURE_BEACON_PROTECTION,
+    WS_NL80211_EXT_FEATURE_CONTROL_PORT_NO_PREAUTH,
+    WS_NL80211_EXT_FEATURE_PROTECTED_TWT,
+    WS_NL80211_EXT_FEATURE_DEL_IBSS_STA,
+    WS_NL80211_EXT_FEATURE_MULTICAST_REGISTRATIONS,
+    WS_NL80211_EXT_FEATURE_BEACON_PROTECTION_CLIENT,
+    WS_NL80211_EXT_FEATURE_SCAN_FREQ_KHZ,
+    WS_NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211_TX_STATUS,
+    WS_NL80211_EXT_FEATURE_OPERATING_CHANNEL_VALIDATION,
+    WS_NL80211_EXT_FEATURE_4WAY_HANDSHAKE_AP_PSK,
+    WS_NL80211_EXT_FEATURE_SAE_OFFLOAD_AP,
+    WS_NL80211_EXT_FEATURE_FILS_DISCOVERY,
+    WS_NL80211_EXT_FEATURE_UNSOL_BCAST_PROBE_RESP,
+    WS_NL80211_EXT_FEATURE_BEACON_RATE_HE,
+    WS_NL80211_EXT_FEATURE_SECURE_LTF,
+    WS_NL80211_EXT_FEATURE_SECURE_RTT,
+    WS_NL80211_EXT_FEATURE_PROT_RANGE_NEGO_AND_MEASURE,
+    WS_NL80211_EXT_FEATURE_BSS_COLOR,
+    WS_NL80211_EXT_FEATURE_FILS_CRYPTO_OFFLOAD,
+    WS_NL80211_EXT_FEATURE_RADAR_BACKGROUND,
+    WS_NL80211_EXT_FEATURE_POWERED_ADDR_CHANGE,
+    WS_NL80211_EXT_FEATURE_PUNCT,
+    WS_NL80211_EXT_FEATURE_SECURE_NAN,
 };
 
 enum ws_nl80211_probe_resp_offload_support_attr {
@@ -1235,6 +1361,8 @@ enum ws_nl80211_scan_flags {
     WS_NL80211_SCAN_FLAG_HIGH_ACCURACY = 1<<10,
     WS_NL80211_SCAN_FLAG_RANDOM_SN = 1<<11,
     WS_NL80211_SCAN_FLAG_MIN_PREQ_CONTENT = 1<<12,
+    WS_NL80211_SCAN_FLAG_FREQ_KHZ = 1<<13,
+    WS_NL80211_SCAN_FLAG_COLOCATED_6GHZ = 1<<14,
 };
 
 enum ws_nl80211_acl_policy {
@@ -1283,6 +1411,7 @@ enum ws_nl80211_tdls_peer_capability {
     WS_NL80211_TDLS_PEER_HT = 1<<0,
     WS_NL80211_TDLS_PEER_VHT = 1<<1,
     WS_NL80211_TDLS_PEER_WMM = 1<<2,
+    WS_NL80211_TDLS_PEER_HE = 1<<3,
 };
 
 enum ws_nl80211_sched_scan_plan {
@@ -1380,6 +1509,7 @@ enum ws_nl80211_preamble {
     WS_NL80211_PREAMBLE_HT,
     WS_NL80211_PREAMBLE_VHT,
     WS_NL80211_PREAMBLE_DMG,
+    WS_NL80211_PREAMBLE_HE,
 };
 
 enum ws_nl80211_peer_measurement_type {
@@ -1437,6 +1567,8 @@ enum ws_nl80211_peer_measurement_ftm_capa {
     WS_NL80211_PMSR_FTM_CAPA_ATTR_BANDWIDTHS,
     WS_NL80211_PMSR_FTM_CAPA_ATTR_MAX_BURSTS_EXPONENT,
     WS_NL80211_PMSR_FTM_CAPA_ATTR_MAX_FTMS_PER_BURST,
+    WS_NL80211_PMSR_FTM_CAPA_ATTR_TRIGGER_BASED,
+    WS_NL80211_PMSR_FTM_CAPA_ATTR_NON_TRIGGER_BASED,
 };
 
 enum ws_nl80211_peer_measurement_ftm_req {
@@ -1450,6 +1582,10 @@ enum ws_nl80211_peer_measurement_ftm_req {
     WS_NL80211_PMSR_FTM_REQ_ATTR_NUM_FTMR_RETRIES,
     WS_NL80211_PMSR_FTM_REQ_ATTR_REQUEST_LCI,
     WS_NL80211_PMSR_FTM_REQ_ATTR_REQUEST_CIVICLOC,
+    WS_NL80211_PMSR_FTM_REQ_ATTR_TRIGGER_BASED,
+    WS_NL80211_PMSR_FTM_REQ_ATTR_NON_TRIGGER_BASED,
+    WS_NL80211_PMSR_FTM_REQ_ATTR_LMR_FEEDBACK,
+    WS_NL80211_PMSR_FTM_REQ_ATTR_BSS_COLOR,
 };
 
 enum ws_nl80211_peer_measurement_ftm_failure_reasons {
@@ -1492,6 +1628,10 @@ enum ws_nl80211_obss_pd_attributes {
     WS___NL80211_HE_OBSS_PD_ATTR_INVALID,
     WS_NL80211_HE_OBSS_PD_ATTR_MIN_OFFSET,
     WS_NL80211_HE_OBSS_PD_ATTR_MAX_OFFSET,
+    WS_NL80211_HE_OBSS_PD_ATTR_NON_SRG_MAX_OFFSET,
+    WS_NL80211_HE_OBSS_PD_ATTR_BSS_COLOR_BITMAP,
+    WS_NL80211_HE_OBSS_PD_ATTR_PARTIAL_BSSID_BITMAP,
+    WS_NL80211_HE_OBSS_PD_ATTR_SR_CTRL,
 };
 
 static const value_string ws_nl80211_commands_vals[] = {
@@ -1632,6 +1772,22 @@ static const value_string ws_nl80211_commands_vals[] = {
     { WS_NL80211_CMD_NOTIFY_RADAR,          "NL80211_CMD_NOTIFY_RADAR" },
     { WS_NL80211_CMD_UPDATE_OWE_INFO,       "NL80211_CMD_UPDATE_OWE_INFO" },
     { WS_NL80211_CMD_PROBE_MESH_LINK,       "NL80211_CMD_PROBE_MESH_LINK" },
+    { WS_NL80211_CMD_SET_TID_CONFIG,        "NL80211_CMD_SET_TID_CONFIG" },
+    { WS_NL80211_CMD_UNPROT_BEACON,         "NL80211_CMD_UNPROT_BEACON" },
+    { WS_NL80211_CMD_CONTROL_PORT_FRAME_TX_STATUS, "NL80211_CMD_CONTROL_PORT_FRAME_TX_STATUS" },
+    { WS_NL80211_CMD_SET_SAR_SPECS,         "NL80211_CMD_SET_SAR_SPECS" },
+    { WS_NL80211_CMD_OBSS_COLOR_COLLISION,  "NL80211_CMD_OBSS_COLOR_COLLISION" },
+    { WS_NL80211_CMD_COLOR_CHANGE_REQUEST,  "NL80211_CMD_COLOR_CHANGE_REQUEST" },
+    { WS_NL80211_CMD_COLOR_CHANGE_STARTED,  "NL80211_CMD_COLOR_CHANGE_STARTED" },
+    { WS_NL80211_CMD_COLOR_CHANGE_ABORTED,  "NL80211_CMD_COLOR_CHANGE_ABORTED" },
+    { WS_NL80211_CMD_COLOR_CHANGE_COMPLETED, "NL80211_CMD_COLOR_CHANGE_COMPLETED" },
+    { WS_NL80211_CMD_SET_FILS_AAD,          "NL80211_CMD_SET_FILS_AAD" },
+    { WS_NL80211_CMD_ASSOC_COMEBACK,        "NL80211_CMD_ASSOC_COMEBACK" },
+    { WS_NL80211_CMD_ADD_LINK,              "NL80211_CMD_ADD_LINK" },
+    { WS_NL80211_CMD_REMOVE_LINK,           "NL80211_CMD_REMOVE_LINK" },
+    { WS_NL80211_CMD_ADD_LINK_STA,          "NL80211_CMD_ADD_LINK_STA" },
+    { WS_NL80211_CMD_MODIFY_LINK_STA,       "NL80211_CMD_MODIFY_LINK_STA" },
+    { WS_NL80211_CMD_REMOVE_LINK_STA,       "NL80211_CMD_REMOVE_LINK_STA" },
     { 0, NULL }
 };
 static value_string_ext ws_nl80211_commands_vals_ext = VALUE_STRING_EXT_INIT(ws_nl80211_commands_vals);
@@ -1823,8 +1979,8 @@ static const value_string ws_nl80211_attrs_vals[] = {
     { WS_NL80211_ATTR_CH_SWITCH_COUNT,      "NL80211_ATTR_CH_SWITCH_COUNT" },
     { WS_NL80211_ATTR_CH_SWITCH_BLOCK_TX,   "NL80211_ATTR_CH_SWITCH_BLOCK_TX" },
     { WS_NL80211_ATTR_CSA_IES,              "NL80211_ATTR_CSA_IES" },
-    { WS_NL80211_ATTR_CSA_C_OFF_BEACON,     "NL80211_ATTR_CSA_C_OFF_BEACON" },
-    { WS_NL80211_ATTR_CSA_C_OFF_PRESP,      "NL80211_ATTR_CSA_C_OFF_PRESP" },
+    { WS_NL80211_ATTR_CNTDWN_OFFS_BEACON,   "NL80211_ATTR_CNTDWN_OFFS_BEACON" },
+    { WS_NL80211_ATTR_CNTDWN_OFFS_PRESP,    "NL80211_ATTR_CNTDWN_OFFS_PRESP" },
     { WS_NL80211_ATTR_RXMGMT_FLAGS,         "NL80211_ATTR_RXMGMT_FLAGS" },
     { WS_NL80211_ATTR_STA_SUPPORTED_CHANNELS, "NL80211_ATTR_STA_SUPPORTED_CHANNELS" },
     { WS_NL80211_ATTR_STA_SUPPORTED_OPER_CLASSES, "NL80211_ATTR_STA_SUPPORTED_OPER_CLASSES" },
@@ -1919,6 +2075,47 @@ static const value_string ws_nl80211_attrs_vals[] = {
     { WS_NL80211_ATTR_HE_OBSS_PD,           "NL80211_ATTR_HE_OBSS_PD" },
     { WS_NL80211_ATTR_WIPHY_EDMG_CHANNELS,  "NL80211_ATTR_WIPHY_EDMG_CHANNELS" },
     { WS_NL80211_ATTR_WIPHY_EDMG_BW_CONFIG, "NL80211_ATTR_WIPHY_EDMG_BW_CONFIG" },
+    { WS_NL80211_ATTR_VLAN_ID,              "NL80211_ATTR_VLAN_ID" },
+    { WS_NL80211_ATTR_HE_BSS_COLOR,         "NL80211_ATTR_HE_BSS_COLOR" },
+    { WS_NL80211_ATTR_IFTYPE_AKM_SUITES,    "NL80211_ATTR_IFTYPE_AKM_SUITES" },
+    { WS_NL80211_ATTR_TID_CONFIG,           "NL80211_ATTR_TID_CONFIG" },
+    { WS_NL80211_ATTR_CONTROL_PORT_NO_PREAUTH, "NL80211_ATTR_CONTROL_PORT_NO_PREAUTH" },
+    { WS_NL80211_ATTR_PMK_LIFETIME,         "NL80211_ATTR_PMK_LIFETIME" },
+    { WS_NL80211_ATTR_PMK_REAUTH_THRESHOLD, "NL80211_ATTR_PMK_REAUTH_THRESHOLD" },
+    { WS_NL80211_ATTR_RECEIVE_MULTICAST,    "NL80211_ATTR_RECEIVE_MULTICAST" },
+    { WS_NL80211_ATTR_WIPHY_FREQ_OFFSET,    "NL80211_ATTR_WIPHY_FREQ_OFFSET" },
+    { WS_NL80211_ATTR_CENTER_FREQ1_OFFSET,  "NL80211_ATTR_CENTER_FREQ1_OFFSET" },
+    { WS_NL80211_ATTR_SCAN_FREQ_KHZ,        "NL80211_ATTR_SCAN_FREQ_KHZ" },
+    { WS_NL80211_ATTR_HE_6GHZ_CAPABILITY,   "NL80211_ATTR_HE_6GHZ_CAPABILITY" },
+    { WS_NL80211_ATTR_FILS_DISCOVERY,       "NL80211_ATTR_FILS_DISCOVERY" },
+    { WS_NL80211_ATTR_UNSOL_BCAST_PROBE_RESP, "NL80211_ATTR_UNSOL_BCAST_PROBE_RESP" },
+    { WS_NL80211_ATTR_S1G_CAPABILITY,       "NL80211_ATTR_S1G_CAPABILITY" },
+    { WS_NL80211_ATTR_S1G_CAPABILITY_MASK,  "NL80211_ATTR_S1G_CAPABILITY_MASK" },
+    { WS_NL80211_ATTR_SAE_PWE,              "NL80211_ATTR_SAE_PWE" },
+    { WS_NL80211_ATTR_RECONNECT_REQUESTED,  "NL80211_ATTR_RECONNECT_REQUESTED" },
+    { WS_NL80211_ATTR_SAR_SPEC,             "NL80211_ATTR_SAR_SPEC" },
+    { WS_NL80211_ATTR_DISABLE_HE,           "NL80211_ATTR_DISABLE_HE" },
+    { WS_NL80211_ATTR_OBSS_COLOR_BITMAP,    "NL80211_ATTR_OBSS_COLOR_BITMAP" },
+    { WS_NL80211_ATTR_COLOR_CHANGE_COUNT,   "NL80211_ATTR_COLOR_CHANGE_COUNT" },
+    { WS_NL80211_ATTR_COLOR_CHANGE_COLOR,   "NL80211_ATTR_COLOR_CHANGE_COLOR" },
+    { WS_NL80211_ATTR_COLOR_CHANGE_ELEMS,   "NL80211_ATTR_COLOR_CHANGE_ELEMS" },
+    { WS_NL80211_ATTR_MBSSID_CONFIG,        "NL80211_ATTR_MBSSID_CONFIG" },
+    { WS_NL80211_ATTR_MBSSID_ELEMS,         "NL80211_ATTR_MBSSID_ELEMS" },
+    { WS_NL80211_ATTR_RADAR_BACKGROUND,     "NL80211_ATTR_RADAR_BACKGROUND" },
+    { WS_NL80211_ATTR_AP_SETTINGS_FLAGS,    "NL80211_ATTR_AP_SETTINGS_FLAGS" },
+    { WS_NL80211_ATTR_EHT_CAPABILITY,       "NL80211_ATTR_EHT_CAPABILITY" },
+    { WS_NL80211_ATTR_DISABLE_EHT,          "NL80211_ATTR_DISABLE_EHT" },
+    { WS_NL80211_ATTR_MLO_LINKS,            "NL80211_ATTR_MLO_LINKS" },
+    { WS_NL80211_ATTR_MLO_LINK_ID,          "NL80211_ATTR_MLO_LINK_ID" },
+    { WS_NL80211_ATTR_MLD_ADDR,             "NL80211_ATTR_MLD_ADDR" },
+    { WS_NL80211_ATTR_MLO_SUPPORT,          "NL80211_ATTR_MLO_SUPPORT" },
+    { WS_NL80211_ATTR_MAX_NUM_AKM_SUITES,   "NL80211_ATTR_MAX_NUM_AKM_SUITES" },
+    { WS_NL80211_ATTR_EML_CAPABILITY,       "NL80211_ATTR_EML_CAPABILITY" },
+    { WS_NL80211_ATTR_MLD_CAPA_AND_OPS,     "NL80211_ATTR_MLD_CAPA_AND_OPS" },
+    { WS_NL80211_ATTR_TX_HW_TIMESTAMP,      "NL80211_ATTR_TX_HW_TIMESTAMP" },
+    { WS_NL80211_ATTR_RX_HW_TIMESTAMP,      "NL80211_ATTR_RX_HW_TIMESTAMP" },
+    { WS_NL80211_ATTR_TD_BITMAP,            "NL80211_ATTR_TD_BITMAP" },
+    { WS_NL80211_ATTR_PUNCT_BITMAP,         "NL80211_ATTR_PUNCT_BITMAP" },
     { 0, NULL }
 };
 static value_string_ext ws_nl80211_attrs_vals_ext = VALUE_STRING_EXT_INIT(ws_nl80211_attrs_vals);
@@ -2000,6 +2197,11 @@ static const value_string ws_nl80211_rate_info_vals[] = {
     { WS_NL80211_RATE_INFO_HE_GI,           "NL80211_RATE_INFO_HE_GI" },
     { WS_NL80211_RATE_INFO_HE_DCM,          "NL80211_RATE_INFO_HE_DCM" },
     { WS_NL80211_RATE_INFO_HE_RU_ALLOC,     "NL80211_RATE_INFO_HE_RU_ALLOC" },
+    { WS_NL80211_RATE_INFO_320_MHZ_WIDTH,   "NL80211_RATE_INFO_320_MHZ_WIDTH" },
+    { WS_NL80211_RATE_INFO_EHT_MCS,         "NL80211_RATE_INFO_EHT_MCS" },
+    { WS_NL80211_RATE_INFO_EHT_NSS,         "NL80211_RATE_INFO_EHT_NSS" },
+    { WS_NL80211_RATE_INFO_EHT_GI,          "NL80211_RATE_INFO_EHT_GI" },
+    { WS_NL80211_RATE_INFO_EHT_RU_ALLOC,    "NL80211_RATE_INFO_EHT_RU_ALLOC" },
     { 0, NULL }
 };
 static value_string_ext ws_nl80211_rate_info_vals_ext = VALUE_STRING_EXT_INIT(ws_nl80211_rate_info_vals);
@@ -2059,6 +2261,7 @@ static const value_string ws_nl80211_sta_info_vals[] = {
     { WS_NL80211_STA_INFO_AIRTIME_WEIGHT,   "NL80211_STA_INFO_AIRTIME_WEIGHT" },
     { WS_NL80211_STA_INFO_AIRTIME_LINK_METRIC, "NL80211_STA_INFO_AIRTIME_LINK_METRIC" },
     { WS_NL80211_STA_INFO_ASSOC_AT_BOOTTIME, "NL80211_STA_INFO_ASSOC_AT_BOOTTIME" },
+    { WS_NL80211_STA_INFO_CONNECTED_TO_AS,  "NL80211_STA_INFO_CONNECTED_TO_AS" },
     { 0, NULL }
 };
 static value_string_ext ws_nl80211_sta_info_vals_ext = VALUE_STRING_EXT_INIT(ws_nl80211_sta_info_vals);
@@ -2124,6 +2327,12 @@ static const value_string ws_nl80211_band_iftype_attr_vals[] = {
     { WS_NL80211_BAND_IFTYPE_ATTR_HE_CAP_PHY, "NL80211_BAND_IFTYPE_ATTR_HE_CAP_PHY" },
     { WS_NL80211_BAND_IFTYPE_ATTR_HE_CAP_MCS_SET, "NL80211_BAND_IFTYPE_ATTR_HE_CAP_MCS_SET" },
     { WS_NL80211_BAND_IFTYPE_ATTR_HE_CAP_PPE, "NL80211_BAND_IFTYPE_ATTR_HE_CAP_PPE" },
+    { WS_NL80211_BAND_IFTYPE_ATTR_HE_6GHZ_CAPA, "NL80211_BAND_IFTYPE_ATTR_HE_6GHZ_CAPA" },
+    { WS_NL80211_BAND_IFTYPE_ATTR_VENDOR_ELEMS, "NL80211_BAND_IFTYPE_ATTR_VENDOR_ELEMS" },
+    { WS_NL80211_BAND_IFTYPE_ATTR_EHT_CAP_MAC, "NL80211_BAND_IFTYPE_ATTR_EHT_CAP_MAC" },
+    { WS_NL80211_BAND_IFTYPE_ATTR_EHT_CAP_PHY, "NL80211_BAND_IFTYPE_ATTR_EHT_CAP_PHY" },
+    { WS_NL80211_BAND_IFTYPE_ATTR_EHT_CAP_MCS_SET, "NL80211_BAND_IFTYPE_ATTR_EHT_CAP_MCS_SET" },
+    { WS_NL80211_BAND_IFTYPE_ATTR_EHT_CAP_PPE, "NL80211_BAND_IFTYPE_ATTR_EHT_CAP_PPE" },
     { 0, NULL }
 };
 static value_string_ext ws_nl80211_band_iftype_attr_vals_ext = VALUE_STRING_EXT_INIT(ws_nl80211_band_iftype_attr_vals);
@@ -2175,6 +2384,15 @@ static const value_string ws_nl80211_frequency_attr_vals[] = {
     { WS_NL80211_FREQUENCY_ATTR_NO_20MHZ,   "NL80211_FREQUENCY_ATTR_NO_20MHZ" },
     { WS_NL80211_FREQUENCY_ATTR_NO_10MHZ,   "NL80211_FREQUENCY_ATTR_NO_10MHZ" },
     { WS_NL80211_FREQUENCY_ATTR_WMM,        "NL80211_FREQUENCY_ATTR_WMM" },
+    { WS_NL80211_FREQUENCY_ATTR_NO_HE,      "NL80211_FREQUENCY_ATTR_NO_HE" },
+    { WS_NL80211_FREQUENCY_ATTR_OFFSET,     "NL80211_FREQUENCY_ATTR_OFFSET" },
+    { WS_NL80211_FREQUENCY_ATTR_1MHZ,       "NL80211_FREQUENCY_ATTR_1MHZ" },
+    { WS_NL80211_FREQUENCY_ATTR_2MHZ,       "NL80211_FREQUENCY_ATTR_2MHZ" },
+    { WS_NL80211_FREQUENCY_ATTR_4MHZ,       "NL80211_FREQUENCY_ATTR_4MHZ" },
+    { WS_NL80211_FREQUENCY_ATTR_8MHZ,       "NL80211_FREQUENCY_ATTR_8MHZ" },
+    { WS_NL80211_FREQUENCY_ATTR_16MHZ,      "NL80211_FREQUENCY_ATTR_16MHZ" },
+    { WS_NL80211_FREQUENCY_ATTR_NO_320MHZ,  "NL80211_FREQUENCY_ATTR_NO_320MHZ" },
+    { WS_NL80211_FREQUENCY_ATTR_NO_EHT,     "NL80211_FREQUENCY_ATTR_NO_EHT" },
     { 0, NULL }
 };
 static value_string_ext ws_nl80211_frequency_attr_vals_ext = VALUE_STRING_EXT_INIT(ws_nl80211_frequency_attr_vals);
@@ -2246,6 +2464,8 @@ static const value_string ws_nl80211_reg_rule_flags_vals[] = {
     { WS_NL80211_RRF_NO_HT40PLUS,           "NL80211_RRF_NO_HT40PLUS" },
     { WS_NL80211_RRF_NO_80MHZ,              "NL80211_RRF_NO_80MHZ" },
     { WS_NL80211_RRF_NO_160MHZ,             "NL80211_RRF_NO_160MHZ" },
+    { WS_NL80211_RRF_NO_HE,                 "NL80211_RRF_NO_HE" },
+    { WS_NL80211_RRF_NO_320MHZ,             "NL80211_RRF_NO_320MHZ" },
     { 0, NULL }
 };
 static value_string_ext ws_nl80211_reg_rule_flags_vals_ext = VALUE_STRING_EXT_INIT(ws_nl80211_reg_rule_flags_vals);
@@ -2280,6 +2500,7 @@ static const value_string ws_nl80211_survey_info_vals[] = {
     { WS_NL80211_SURVEY_INFO_TIME_SCAN,     "NL80211_SURVEY_INFO_TIME_SCAN" },
     { WS_NL80211_SURVEY_INFO_PAD,           "NL80211_SURVEY_INFO_PAD" },
     { WS_NL80211_SURVEY_INFO_TIME_BSS_RX,   "NL80211_SURVEY_INFO_TIME_BSS_RX" },
+    { WS_NL80211_SURVEY_INFO_FREQUENCY_OFFSET, "NL80211_SURVEY_INFO_FREQUENCY_OFFSET" },
     { 0, NULL }
 };
 static value_string_ext ws_nl80211_survey_info_vals_ext = VALUE_STRING_EXT_INIT(ws_nl80211_survey_info_vals);
@@ -2336,6 +2557,8 @@ static const value_string ws_nl80211_meshconf_params_vals[] = {
     { WS_NL80211_MESHCONF_AWAKE_WINDOW,     "NL80211_MESHCONF_AWAKE_WINDOW" },
     { WS_NL80211_MESHCONF_PLINK_TIMEOUT,    "NL80211_MESHCONF_PLINK_TIMEOUT" },
     { WS_NL80211_MESHCONF_CONNECTED_TO_GATE, "NL80211_MESHCONF_CONNECTED_TO_GATE" },
+    { WS_NL80211_MESHCONF_NOLEARN,          "NL80211_MESHCONF_NOLEARN" },
+    { WS_NL80211_MESHCONF_CONNECTED_TO_AS,  "NL80211_MESHCONF_CONNECTED_TO_AS" },
     { 0, NULL }
 };
 static value_string_ext ws_nl80211_meshconf_params_vals_ext = VALUE_STRING_EXT_INIT(ws_nl80211_meshconf_params_vals);
@@ -2401,6 +2624,12 @@ static const value_string ws_nl80211_chan_width_vals[] = {
     { WS_NL80211_CHAN_WIDTH_160,            "NL80211_CHAN_WIDTH_160" },
     { WS_NL80211_CHAN_WIDTH_5,              "NL80211_CHAN_WIDTH_5" },
     { WS_NL80211_CHAN_WIDTH_10,             "NL80211_CHAN_WIDTH_10" },
+    { WS_NL80211_CHAN_WIDTH_1,              "NL80211_CHAN_WIDTH_1" },
+    { WS_NL80211_CHAN_WIDTH_2,              "NL80211_CHAN_WIDTH_2" },
+    { WS_NL80211_CHAN_WIDTH_4,              "NL80211_CHAN_WIDTH_4" },
+    { WS_NL80211_CHAN_WIDTH_8,              "NL80211_CHAN_WIDTH_8" },
+    { WS_NL80211_CHAN_WIDTH_16,             "NL80211_CHAN_WIDTH_16" },
+    { WS_NL80211_CHAN_WIDTH_320,            "NL80211_CHAN_WIDTH_320" },
     { 0, NULL }
 };
 static value_string_ext ws_nl80211_chan_width_vals_ext = VALUE_STRING_EXT_INIT(ws_nl80211_chan_width_vals);
@@ -2409,6 +2638,8 @@ static const value_string ws_nl80211_bss_scan_width_vals[] = {
     { WS_NL80211_BSS_CHAN_WIDTH_20,         "NL80211_BSS_CHAN_WIDTH_20" },
     { WS_NL80211_BSS_CHAN_WIDTH_10,         "NL80211_BSS_CHAN_WIDTH_10" },
     { WS_NL80211_BSS_CHAN_WIDTH_5,          "NL80211_BSS_CHAN_WIDTH_5" },
+    { WS_NL80211_BSS_CHAN_WIDTH_1,          "NL80211_BSS_CHAN_WIDTH_1" },
+    { WS_NL80211_BSS_CHAN_WIDTH_2,          "NL80211_BSS_CHAN_WIDTH_2" },
     { 0, NULL }
 };
 static value_string_ext ws_nl80211_bss_scan_width_vals_ext = VALUE_STRING_EXT_INIT(ws_nl80211_bss_scan_width_vals);
@@ -2434,6 +2665,9 @@ static const value_string ws_nl80211_bss_vals[] = {
     { WS_NL80211_BSS_PARENT_TSF,            "NL80211_BSS_PARENT_TSF" },
     { WS_NL80211_BSS_PARENT_BSSID,          "NL80211_BSS_PARENT_BSSID" },
     { WS_NL80211_BSS_CHAIN_SIGNAL,          "NL80211_BSS_CHAIN_SIGNAL" },
+    { WS_NL80211_BSS_FREQUENCY_OFFSET,      "NL80211_BSS_FREQUENCY_OFFSET" },
+    { WS_NL80211_BSS_MLO_LINK_ID,           "NL80211_BSS_MLO_LINK_ID" },
+    { WS_NL80211_BSS_MLD_ADDR,              "NL80211_BSS_MLD_ADDR" },
     { 0, NULL }
 };
 static value_string_ext ws_nl80211_bss_vals_ext = VALUE_STRING_EXT_INIT(ws_nl80211_bss_vals);
@@ -2502,6 +2736,7 @@ static const value_string ws_nl80211_key_attributes_vals[] = {
     { WS_NL80211_KEY_TYPE,                  "NL80211_KEY_TYPE" },
     { WS_NL80211_KEY_DEFAULT_TYPES,         "NL80211_KEY_DEFAULT_TYPES" },
     { WS_NL80211_KEY_MODE,                  "NL80211_KEY_MODE" },
+    { WS_NL80211_KEY_DEFAULT_BEACON,        "NL80211_KEY_DEFAULT_BEACON" },
     { 0, NULL }
 };
 static value_string_ext ws_nl80211_key_attributes_vals_ext = VALUE_STRING_EXT_INIT(ws_nl80211_key_attributes_vals);
@@ -2512,6 +2747,9 @@ static const value_string ws_nl80211_tx_rate_attributes_vals[] = {
     { WS_NL80211_TXRATE_HT,                 "NL80211_TXRATE_HT" },
     { WS_NL80211_TXRATE_VHT,                "NL80211_TXRATE_VHT" },
     { WS_NL80211_TXRATE_GI,                 "NL80211_TXRATE_GI" },
+    { WS_NL80211_TXRATE_HE,                 "NL80211_TXRATE_HE" },
+    { WS_NL80211_TXRATE_HE_GI,              "NL80211_TXRATE_HE_GI" },
+    { WS_NL80211_TXRATE_HE_LTF,             "NL80211_TXRATE_HE_LTF" },
     { 0, NULL }
 };
 static value_string_ext ws_nl80211_tx_rate_attributes_vals_ext = VALUE_STRING_EXT_INIT(ws_nl80211_tx_rate_attributes_vals);
@@ -2529,6 +2767,8 @@ static const value_string ws_nl80211_band_vals[] = {
     { WS_NL80211_BAND_5GHZ,                 "NL80211_BAND_5GHZ" },
     { WS_NL80211_BAND_60GHZ,                "NL80211_BAND_60GHZ" },
     { WS_NL80211_BAND_6GHZ,                 "NL80211_BAND_6GHZ" },
+    { WS_NL80211_BAND_S1GHZ,                "NL80211_BAND_S1GHZ" },
+    { WS_NL80211_BAND_LC,                   "NL80211_BAND_LC" },
     { 0, NULL }
 };
 static value_string_ext ws_nl80211_band_vals_ext = VALUE_STRING_EXT_INIT(ws_nl80211_band_vals);
@@ -2684,6 +2924,7 @@ static const value_string ws_nl80211_rekey_data_vals[] = {
     { WS_NL80211_REKEY_DATA_KEK,            "NL80211_REKEY_DATA_KEK" },
     { WS_NL80211_REKEY_DATA_KCK,            "NL80211_REKEY_DATA_KCK" },
     { WS_NL80211_REKEY_DATA_REPLAY_CTR,     "NL80211_REKEY_DATA_REPLAY_CTR" },
+    { WS_NL80211_REKEY_DATA_AKM,            "NL80211_REKEY_DATA_AKM" },
     { 0, NULL }
 };
 static value_string_ext ws_nl80211_rekey_data_vals_ext = VALUE_STRING_EXT_INIT(ws_nl80211_rekey_data_vals);
@@ -2799,6 +3040,31 @@ static const value_string ws_nl80211_ext_feature_index_vals[] = {
     { WS_NL80211_EXT_FEATURE_EXT_KEY_ID,    "NL80211_EXT_FEATURE_EXT_KEY_ID" },
     { WS_NL80211_EXT_FEATURE_STA_TX_PWR,    "NL80211_EXT_FEATURE_STA_TX_PWR" },
     { WS_NL80211_EXT_FEATURE_SAE_OFFLOAD,   "NL80211_EXT_FEATURE_SAE_OFFLOAD" },
+    { WS_NL80211_EXT_FEATURE_VLAN_OFFLOAD,  "NL80211_EXT_FEATURE_VLAN_OFFLOAD" },
+    { WS_NL80211_EXT_FEATURE_AQL,           "NL80211_EXT_FEATURE_AQL" },
+    { WS_NL80211_EXT_FEATURE_BEACON_PROTECTION, "NL80211_EXT_FEATURE_BEACON_PROTECTION" },
+    { WS_NL80211_EXT_FEATURE_CONTROL_PORT_NO_PREAUTH, "NL80211_EXT_FEATURE_CONTROL_PORT_NO_PREAUTH" },
+    { WS_NL80211_EXT_FEATURE_PROTECTED_TWT, "NL80211_EXT_FEATURE_PROTECTED_TWT" },
+    { WS_NL80211_EXT_FEATURE_DEL_IBSS_STA,  "NL80211_EXT_FEATURE_DEL_IBSS_STA" },
+    { WS_NL80211_EXT_FEATURE_MULTICAST_REGISTRATIONS, "NL80211_EXT_FEATURE_MULTICAST_REGISTRATIONS" },
+    { WS_NL80211_EXT_FEATURE_BEACON_PROTECTION_CLIENT, "NL80211_EXT_FEATURE_BEACON_PROTECTION_CLIENT" },
+    { WS_NL80211_EXT_FEATURE_SCAN_FREQ_KHZ, "NL80211_EXT_FEATURE_SCAN_FREQ_KHZ" },
+    { WS_NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211_TX_STATUS, "NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211_TX_STATUS" },
+    { WS_NL80211_EXT_FEATURE_OPERATING_CHANNEL_VALIDATION, "NL80211_EXT_FEATURE_OPERATING_CHANNEL_VALIDATION" },
+    { WS_NL80211_EXT_FEATURE_4WAY_HANDSHAKE_AP_PSK, "NL80211_EXT_FEATURE_4WAY_HANDSHAKE_AP_PSK" },
+    { WS_NL80211_EXT_FEATURE_SAE_OFFLOAD_AP, "NL80211_EXT_FEATURE_SAE_OFFLOAD_AP" },
+    { WS_NL80211_EXT_FEATURE_FILS_DISCOVERY, "NL80211_EXT_FEATURE_FILS_DISCOVERY" },
+    { WS_NL80211_EXT_FEATURE_UNSOL_BCAST_PROBE_RESP, "NL80211_EXT_FEATURE_UNSOL_BCAST_PROBE_RESP" },
+    { WS_NL80211_EXT_FEATURE_BEACON_RATE_HE, "NL80211_EXT_FEATURE_BEACON_RATE_HE" },
+    { WS_NL80211_EXT_FEATURE_SECURE_LTF,    "NL80211_EXT_FEATURE_SECURE_LTF" },
+    { WS_NL80211_EXT_FEATURE_SECURE_RTT,    "NL80211_EXT_FEATURE_SECURE_RTT" },
+    { WS_NL80211_EXT_FEATURE_PROT_RANGE_NEGO_AND_MEASURE, "NL80211_EXT_FEATURE_PROT_RANGE_NEGO_AND_MEASURE" },
+    { WS_NL80211_EXT_FEATURE_BSS_COLOR,     "NL80211_EXT_FEATURE_BSS_COLOR" },
+    { WS_NL80211_EXT_FEATURE_FILS_CRYPTO_OFFLOAD, "NL80211_EXT_FEATURE_FILS_CRYPTO_OFFLOAD" },
+    { WS_NL80211_EXT_FEATURE_RADAR_BACKGROUND, "NL80211_EXT_FEATURE_RADAR_BACKGROUND" },
+    { WS_NL80211_EXT_FEATURE_POWERED_ADDR_CHANGE, "NL80211_EXT_FEATURE_POWERED_ADDR_CHANGE" },
+    { WS_NL80211_EXT_FEATURE_PUNCT,         "NL80211_EXT_FEATURE_PUNCT" },
+    { WS_NL80211_EXT_FEATURE_SECURE_NAN,    "NL80211_EXT_FEATURE_SECURE_NAN" },
     { 0, NULL }
 };
 static value_string_ext ws_nl80211_ext_feature_index_vals_ext = VALUE_STRING_EXT_INIT(ws_nl80211_ext_feature_index_vals);
@@ -2842,6 +3108,8 @@ static const value_string ws_nl80211_scan_flags_vals[] = {
     { WS_NL80211_SCAN_FLAG_HIGH_ACCURACY,   "NL80211_SCAN_FLAG_HIGH_ACCURACY" },
     { WS_NL80211_SCAN_FLAG_RANDOM_SN,       "NL80211_SCAN_FLAG_RANDOM_SN" },
     { WS_NL80211_SCAN_FLAG_MIN_PREQ_CONTENT, "NL80211_SCAN_FLAG_MIN_PREQ_CONTENT" },
+    { WS_NL80211_SCAN_FLAG_FREQ_KHZ,        "NL80211_SCAN_FLAG_FREQ_KHZ" },
+    { WS_NL80211_SCAN_FLAG_COLOCATED_6GHZ,  "NL80211_SCAN_FLAG_COLOCATED_6GHZ" },
     { 0, NULL }
 };
 static value_string_ext ws_nl80211_scan_flags_vals_ext = VALUE_STRING_EXT_INIT(ws_nl80211_scan_flags_vals);
@@ -2906,6 +3174,7 @@ static const value_string ws_nl80211_tdls_peer_capability_vals[] = {
     { WS_NL80211_TDLS_PEER_HT,              "NL80211_TDLS_PEER_HT" },
     { WS_NL80211_TDLS_PEER_VHT,             "NL80211_TDLS_PEER_VHT" },
     { WS_NL80211_TDLS_PEER_WMM,             "NL80211_TDLS_PEER_WMM" },
+    { WS_NL80211_TDLS_PEER_HE,              "NL80211_TDLS_PEER_HE" },
     { 0, NULL }
 };
 static value_string_ext ws_nl80211_tdls_peer_capability_vals_ext = VALUE_STRING_EXT_INIT(ws_nl80211_tdls_peer_capability_vals);
@@ -3027,6 +3296,7 @@ static const value_string ws_nl80211_preamble_vals[] = {
     { WS_NL80211_PREAMBLE_HT,               "NL80211_PREAMBLE_HT" },
     { WS_NL80211_PREAMBLE_VHT,              "NL80211_PREAMBLE_VHT" },
     { WS_NL80211_PREAMBLE_DMG,              "NL80211_PREAMBLE_DMG" },
+    { WS_NL80211_PREAMBLE_HE,               "NL80211_PREAMBLE_HE" },
     { 0, NULL }
 };
 static value_string_ext ws_nl80211_preamble_vals_ext = VALUE_STRING_EXT_INIT(ws_nl80211_preamble_vals);
@@ -3098,6 +3368,8 @@ static const value_string ws_nl80211_peer_measurement_ftm_capa_vals[] = {
     { WS_NL80211_PMSR_FTM_CAPA_ATTR_BANDWIDTHS, "NL80211_PMSR_FTM_CAPA_ATTR_BANDWIDTHS" },
     { WS_NL80211_PMSR_FTM_CAPA_ATTR_MAX_BURSTS_EXPONENT, "NL80211_PMSR_FTM_CAPA_ATTR_MAX_BURSTS_EXPONENT" },
     { WS_NL80211_PMSR_FTM_CAPA_ATTR_MAX_FTMS_PER_BURST, "NL80211_PMSR_FTM_CAPA_ATTR_MAX_FTMS_PER_BURST" },
+    { WS_NL80211_PMSR_FTM_CAPA_ATTR_TRIGGER_BASED, "NL80211_PMSR_FTM_CAPA_ATTR_TRIGGER_BASED" },
+    { WS_NL80211_PMSR_FTM_CAPA_ATTR_NON_TRIGGER_BASED, "NL80211_PMSR_FTM_CAPA_ATTR_NON_TRIGGER_BASED" },
     { 0, NULL }
 };
 static value_string_ext ws_nl80211_peer_measurement_ftm_capa_vals_ext = VALUE_STRING_EXT_INIT(ws_nl80211_peer_measurement_ftm_capa_vals);
@@ -3113,6 +3385,10 @@ static const value_string ws_nl80211_peer_measurement_ftm_req_vals[] = {
     { WS_NL80211_PMSR_FTM_REQ_ATTR_NUM_FTMR_RETRIES, "NL80211_PMSR_FTM_REQ_ATTR_NUM_FTMR_RETRIES" },
     { WS_NL80211_PMSR_FTM_REQ_ATTR_REQUEST_LCI, "NL80211_PMSR_FTM_REQ_ATTR_REQUEST_LCI" },
     { WS_NL80211_PMSR_FTM_REQ_ATTR_REQUEST_CIVICLOC, "NL80211_PMSR_FTM_REQ_ATTR_REQUEST_CIVICLOC" },
+    { WS_NL80211_PMSR_FTM_REQ_ATTR_TRIGGER_BASED, "NL80211_PMSR_FTM_REQ_ATTR_TRIGGER_BASED" },
+    { WS_NL80211_PMSR_FTM_REQ_ATTR_NON_TRIGGER_BASED, "NL80211_PMSR_FTM_REQ_ATTR_NON_TRIGGER_BASED" },
+    { WS_NL80211_PMSR_FTM_REQ_ATTR_LMR_FEEDBACK, "NL80211_PMSR_FTM_REQ_ATTR_LMR_FEEDBACK" },
+    { WS_NL80211_PMSR_FTM_REQ_ATTR_BSS_COLOR, "NL80211_PMSR_FTM_REQ_ATTR_BSS_COLOR" },
     { 0, NULL }
 };
 static value_string_ext ws_nl80211_peer_measurement_ftm_req_vals_ext = VALUE_STRING_EXT_INIT(ws_nl80211_peer_measurement_ftm_req_vals);
@@ -3161,6 +3437,10 @@ static const value_string ws_nl80211_obss_pd_attributes_vals[] = {
     { WS___NL80211_HE_OBSS_PD_ATTR_INVALID, "__NL80211_HE_OBSS_PD_ATTR_INVALID" },
     { WS_NL80211_HE_OBSS_PD_ATTR_MIN_OFFSET, "NL80211_HE_OBSS_PD_ATTR_MIN_OFFSET" },
     { WS_NL80211_HE_OBSS_PD_ATTR_MAX_OFFSET, "NL80211_HE_OBSS_PD_ATTR_MAX_OFFSET" },
+    { WS_NL80211_HE_OBSS_PD_ATTR_NON_SRG_MAX_OFFSET, "NL80211_HE_OBSS_PD_ATTR_NON_SRG_MAX_OFFSET" },
+    { WS_NL80211_HE_OBSS_PD_ATTR_BSS_COLOR_BITMAP, "NL80211_HE_OBSS_PD_ATTR_BSS_COLOR_BITMAP" },
+    { WS_NL80211_HE_OBSS_PD_ATTR_PARTIAL_BSSID_BITMAP, "NL80211_HE_OBSS_PD_ATTR_PARTIAL_BSSID_BITMAP" },
+    { WS_NL80211_HE_OBSS_PD_ATTR_SR_CTRL,   "NL80211_HE_OBSS_PD_ATTR_SR_CTRL" },
     { 0, NULL }
 };
 static value_string_ext ws_nl80211_obss_pd_attributes_vals_ext = VALUE_STRING_EXT_INIT(ws_nl80211_obss_pd_attributes_vals);
diff --git a/epan/dissectors/packet-netlink-route.c b/epan/dissectors/packet-netlink-route.c
index 764b34b079..da25b9f963 100644
--- a/epan/dissectors/packet-netlink-route.c
+++ b/epan/dissectors/packet-netlink-route.c
@@ -128,6 +128,18 @@ enum {
 	WS_RTM_NEWNEXTHOP   = 104,
 	WS_RTM_DELNEXTHOP   = 105,
 	WS_RTM_GETNEXTHOP   = 106,
+	WS_RTM_NEWLINKPROP  = 108,
+	WS_RTM_DELLINKPROP  = 109,
+	WS_RTM_GETLINKPROP  = 110,
+	WS_RTM_NEWVLAN      = 112,
+	WS_RTM_DELVLAN      = 113,
+	WS_RTM_GETVLAN      = 114,
+	WS_RTM_NEWNEXTHOPBUCKET = 116,
+	WS_RTM_DELNEXTHOPBUCKET = 117,
+	WS_RTM_GETNEXTHOPBUCKET = 118,
+	WS_RTM_NEWTUNNEL    = 120,
+	WS_RTM_DELTUNNEL    = 121,
+	WS_RTM_GETTUNNEL    = 122,
 };
 
 /* values for rta_type (network interface) from </include/uapi/linux/if_link.h> */
@@ -184,6 +196,16 @@ enum ws_ifla_attr_type {
 	WS_IFLA_NEW_IFINDEX     = 49,
 	WS_IFLA_MIN_MTU         = 50,
 	WS_IFLA_MAX_MTU         = 51,
+	WS_IFLA_PROP_LIST       = 52,
+	WS_IFLA_ALT_IFNAME      = 53,
+	WS_IFLA_PERM_ADDRESS    = 54,
+	WS_IFLA_PROTO_DOWN_REASON = 55,
+	WS_IFLA_PARENT_DEV_NAME = 56,
+	WS_IFLA_PARENT_DEV_BUS_NAME = 57,
+	WS_IFLA_GRO_MAX_SIZE    = 58,
+	WS_IFLA_TSO_MAX_SIZE    = 59,
+	WS_IFLA_TSO_MAX_SEGS    = 60,
+	WS_IFLA_ALLMULTI        = 61,
 };
 
 /* values for rta_type (ip address) from <include/uapi/linux/if_addr.h> */
@@ -199,6 +221,7 @@ enum ws_ifa_attr_type {
 	WS_IFA_FLAGS       = 8,
 	WS_IFA_RT_PRIORITY = 9,
 	WS_IFA_TARGET_NETNSID = 10,
+	WS_IFA_PROTO       = 11,
 };
 
 /* values for rta_type (route) from <include/uapi/linux/rtnetlink.h> */
@@ -620,6 +643,16 @@ static const value_string netlink_route_ifla_attr_vals[] = {
 	{ WS_IFLA_NEW_IFINDEX,    "IFLA_NEW_IFINDEX" },
 	{ WS_IFLA_MIN_MTU,        "Minimum MTU" },
 	{ WS_IFLA_MAX_MTU,        "Maximum MTU" },
+	{ WS_IFLA_PROP_LIST,      "Property list" },
+	{ WS_IFLA_ALT_IFNAME,     "Alternative ifname" },
+	{ WS_IFLA_PERM_ADDRESS,   "Permanent address" },
+	{ WS_IFLA_PROTO_DOWN_REASON, "Protocol down reason" },
+	{ WS_IFLA_PARENT_DEV_NAME, "Parent device name" },
+	{ WS_IFLA_PARENT_DEV_BUS_NAME, "Parent device bus name" },
+	{ WS_IFLA_GRO_MAX_SIZE,   "GRO maximum size" },
+	{ WS_IFLA_TSO_MAX_SIZE,   "TSO maximum size" },
+	{ WS_IFLA_TSO_MAX_SEGS,   "TSO maximum number of segments" },
+	{ WS_IFLA_ALLMULTI,       "Allmulti count" },
 	{ 0, NULL }
 };
 
@@ -873,6 +906,7 @@ static const value_string netlink_route_ifa_attr_vals[] = {
 	{ WS_IFA_FLAGS,     "Address flags" },
 	{ WS_IFA_RT_PRIORITY, "IFA_RT_PRIORITY" },
 	{ WS_IFA_TARGET_NETNSID, "IFA_TARGET_NETNSID" },
+	{ WS_IFA_PROTO,     "IFA_PROTO" },
 	{ 0, NULL }
 };
 
@@ -1184,6 +1218,18 @@ static const value_string netlink_route_type_vals[] = {
 	{ WS_RTM_NEWNEXTHOP,    "New next hop" },
 	{ WS_RTM_DELNEXTHOP,    "Delete next hop" },
 	{ WS_RTM_GETNEXTHOP,    "Get next hop" },
+	{ WS_RTM_NEWLINKPROP,   "New link property" },
+	{ WS_RTM_DELLINKPROP,   "Delete link property" },
+	{ WS_RTM_GETLINKPROP,   "Get link property" },
+	{ WS_RTM_NEWVLAN,       "New VLAN" },
+	{ WS_RTM_DELVLAN,       "Delete VLAN" },
+	{ WS_RTM_GETVLAN,       "Get VLAN" },
+	{ WS_RTM_NEWNEXTHOPBUCKET, "New next hop bucket" },
+	{ WS_RTM_DELNEXTHOPBUCKET, "Delete next hop bucket" },
+	{ WS_RTM_GETNEXTHOPBUCKET, "Get next hop bucket" },
+	{ WS_RTM_NEWTUNNEL,     "New tunnel" },
+	{ WS_RTM_DELTUNNEL,     "Delete tunnel" },
+	{ WS_RTM_GETTUNNEL,     "Get tunnel" },
 	{ 0, NULL }
 };
 static value_string_ext netlink_route_type_vals_ext = VALUE_STRING_EXT_INIT(netlink_route_type_vals);
diff --git a/epan/dissectors/packet-netlink-sock_diag.c b/epan/dissectors/packet-netlink-sock_diag.c
index 9c5dbf0ea4..231e460ea7 100644
--- a/epan/dissectors/packet-netlink-sock_diag.c
+++ b/epan/dissectors/packet-netlink-sock_diag.c
@@ -98,6 +98,9 @@ enum ws_inet_diag_attr_type {
 	WS_INET_DIAG_CLASS_ID  = 17,
 	WS_INET_DIAG_MD5SIG    = 18,
 	WS_INET_DIAG_ULP_INFO  = 19,
+	WS_INET_DIAG_SK_BPF_STORAGES = 20,
+	WS_INET_DIAG_CGROUP_ID = 21,
+	WS_INET_DIAG_SOCKOPT   = 22,
 };
 
 enum ws_netlink_diag_show_type {
@@ -502,6 +505,12 @@ static const value_string netlink_sock_diag_inet_attr_vals[] = {
 	{ WS_INET_DIAG_PAD,        "pad" },
 	{ WS_INET_DIAG_MARK,       "mark" },
 	{ WS_INET_DIAG_BBRINFO,    "bbrinfo" },
+	{ WS_INET_DIAG_CLASS_ID,   "class_id" },
+	{ WS_INET_DIAG_MD5SIG,     "md5sig" },
+	{ WS_INET_DIAG_ULP_INFO,   "ulp_info" },
+	{ WS_INET_DIAG_SK_BPF_STORAGES, "sk_bpf_storages" },
+	{ WS_INET_DIAG_CGROUP_ID,  "cgroup_id" },
+	{ WS_INET_DIAG_SOCKOPT,    "sockopt" },
 	{ 0, NULL }
 };