sys/linux: change netlink policies to the new $ convention

14 files changed, 405 insertions, 405 deletions

diff --git a/sys/linux/socket_ieee802154.txt b/sys/linux/socket_ieee802154.txt
index 654b827e9..2c3c9b4e8 100644
--- a/sys/linux/socket_ieee802154.txt
+++ b/sys/linux/socket_ieee802154.txt
@@ -54,50 +54,50 @@ type msghdr_nl802154[CMD, POLICY] msghdr_netlink[netlink_msg_t[genl_nl802154_fam
 syz_genetlink_get_family_id$nl802154(name ptr[in, string["nl802154"]], fd sock_nl_generic_init) genl_nl802154_family_id
 ioctl$sock_SIOCGIFINDEX_802154(fd sock_nl_generic_init, cmd const[SIOCGIFINDEX], arg ptr[out, ifreq_dev_t[ieee802154_dev_names, ieee802154_ifindex]])
 
-sendmsg$NL802154_CMD_GET_WPAN_PHY(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_GET_WPAN_PHY, nl802154_policy_GET_WPAN_PHY]], f flags[send_flags])
-sendmsg$NL802154_CMD_GET_INTERFACE(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_GET_INTERFACE, nl802154_policy_GET_INTERFACE]], f flags[send_flags])
-sendmsg$NL802154_CMD_NEW_INTERFACE(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_NEW_INTERFACE, nl802154_policy_NEW_INTERFACE]], f flags[send_flags])
+sendmsg$NL802154_CMD_GET_WPAN_PHY(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_GET_WPAN_PHY, nl802154_policy$GET_WPAN_PHY]], f flags[send_flags])
+sendmsg$NL802154_CMD_GET_INTERFACE(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_GET_INTERFACE, nl802154_policy$GET_INTERFACE]], f flags[send_flags])
+sendmsg$NL802154_CMD_NEW_INTERFACE(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_NEW_INTERFACE, nl802154_policy$NEW_INTERFACE]], f flags[send_flags])
 # This is disabled as we only have 2 global hwsim devices, if we delete them we are out of devices.
-# sendmsg$NL802154_CMD_DEL_INTERFACE(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_DEL_INTERFACE, nl802154_policy_DEL_INTERFACE]], f flags[send_flags])
-sendmsg$NL802154_CMD_SET_CHANNEL(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_SET_CHANNEL, nl802154_policy_SET_CHANNEL]], f flags[send_flags])
-sendmsg$NL802154_CMD_SET_CCA_MODE(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_SET_CCA_MODE, nl802154_policy_SET_CCA_MODE]], f flags[send_flags])
-sendmsg$NL802154_CMD_SET_CCA_ED_LEVEL(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_SET_CCA_ED_LEVEL, nl802154_policy_SET_CCA_ED_LEVEL]], f flags[send_flags])
-sendmsg$NL802154_CMD_SET_TX_POWER(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_SET_TX_POWER, nl802154_policy_SET_TX_POWER]], f flags[send_flags])
+# sendmsg$NL802154_CMD_DEL_INTERFACE(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_DEL_INTERFACE, nl802154_policy$DEL_INTERFACE]], f flags[send_flags])
+sendmsg$NL802154_CMD_SET_CHANNEL(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_SET_CHANNEL, nl802154_policy$SET_CHANNEL]], f flags[send_flags])
+sendmsg$NL802154_CMD_SET_CCA_MODE(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_SET_CCA_MODE, nl802154_policy$SET_CCA_MODE]], f flags[send_flags])
+sendmsg$NL802154_CMD_SET_CCA_ED_LEVEL(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_SET_CCA_ED_LEVEL, nl802154_policy$SET_CCA_ED_LEVEL]], f flags[send_flags])
+sendmsg$NL802154_CMD_SET_TX_POWER(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_SET_TX_POWER, nl802154_policy$SET_TX_POWER]], f flags[send_flags])
 # This may be more harmful than useful. Once we move the device from init ns, we won't be able to test it anymore...
-sendmsg$NL802154_CMD_SET_WPAN_PHY_NETNS(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_SET_WPAN_PHY_NETNS, nl802154_policy_SET_WPAN_PHY_NETNS]], f flags[send_flags])
-sendmsg$NL802154_CMD_SET_PAN_ID(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_SET_PAN_ID, nl802154_policy_SET_PAN_ID]], f flags[send_flags])
-sendmsg$NL802154_CMD_SET_SHORT_ADDR(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_SET_SHORT_ADDR, nl802154_policy_SET_SHORT_ADDR]], f flags[send_flags])
-sendmsg$NL802154_CMD_SET_BACKOFF_EXPONENT(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_SET_BACKOFF_EXPONENT, nl802154_policy_SET_BACKOFF_EXPONENT]], f flags[send_flags])
-sendmsg$NL802154_CMD_SET_MAX_CSMA_BACKOFFS(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_SET_MAX_CSMA_BACKOFFS, nl802154_policy_SET_MAX_CSMA_BACKOFFS]], f flags[send_flags])
-sendmsg$NL802154_CMD_SET_MAX_FRAME_RETRIES(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_SET_MAX_FRAME_RETRIES, nl802154_policy_SET_MAX_FRAME_RETRIES]], f flags[send_flags])
-sendmsg$NL802154_CMD_SET_LBT_MODE(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_SET_LBT_MODE, nl802154_policy_SET_LBT_MODE]], f flags[send_flags])
-sendmsg$NL802154_CMD_SET_ACKREQ_DEFAULT(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_SET_ACKREQ_DEFAULT, nl802154_policy_SET_ACKREQ_DEFAULT]], f flags[send_flags])
-sendmsg$NL802154_CMD_SET_SEC_PARAMS(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_SET_SEC_PARAMS, nl802154_policy_SET_SEC_PARAMS]], f flags[send_flags])
-sendmsg$NL802154_CMD_GET_SEC_KEY(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_GET_SEC_KEY, nl802154_policy_GET_SEC_KEY]], f flags[send_flags])
-sendmsg$NL802154_CMD_NEW_SEC_KEY(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_NEW_SEC_KEY, nl802154_policy_NEW_SEC_KEY]], f flags[send_flags])
-sendmsg$NL802154_CMD_DEL_SEC_KEY(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_DEL_SEC_KEY, nl802154_policy_DEL_SEC_KEY]], f flags[send_flags])
-sendmsg$NL802154_CMD_GET_SEC_DEV(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_GET_SEC_DEV, nl802154_policy_GET_SEC_DEV]], f flags[send_flags])
-sendmsg$NL802154_CMD_NEW_SEC_DEV(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_NEW_SEC_DEV, nl802154_policy_NEW_SEC_DEV]], f flags[send_flags])
-sendmsg$NL802154_CMD_DEL_SEC_DEV(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_DEL_SEC_DEV, nl802154_policy_DEL_SEC_DEV]], f flags[send_flags])
-sendmsg$NL802154_CMD_GET_SEC_DEVKEY(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_GET_SEC_DEVKEY, nl802154_policy_GET_SEC_DEVKEY]], f flags[send_flags])
-sendmsg$NL802154_CMD_NEW_SEC_DEVKEY(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_NEW_SEC_DEVKEY, nl802154_policy_NEW_SEC_DEVKEY]], f flags[send_flags])
-sendmsg$NL802154_CMD_DEL_SEC_DEVKEY(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_DEL_SEC_DEVKEY, nl802154_policy_DEL_SEC_DEVKEY]], f flags[send_flags])
-sendmsg$NL802154_CMD_GET_SEC_LEVEL(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_GET_SEC_LEVEL, nl802154_policy_GET_SEC_LEVEL]], f flags[send_flags])
-sendmsg$NL802154_CMD_NEW_SEC_LEVEL(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_NEW_SEC_LEVEL, nl802154_policy_NEW_DEL_SEC_LEVEL]], f flags[send_flags])
-sendmsg$NL802154_CMD_DEL_SEC_LEVEL(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_DEL_SEC_LEVEL, nl802154_policy_NEW_DEL_SEC_LEVEL]], f flags[send_flags])
-
-nl802154_policy_GET_WPAN_PHY [
+sendmsg$NL802154_CMD_SET_WPAN_PHY_NETNS(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_SET_WPAN_PHY_NETNS, nl802154_policy$SET_WPAN_PHY_NETNS]], f flags[send_flags])
+sendmsg$NL802154_CMD_SET_PAN_ID(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_SET_PAN_ID, nl802154_policy$SET_PAN_ID]], f flags[send_flags])
+sendmsg$NL802154_CMD_SET_SHORT_ADDR(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_SET_SHORT_ADDR, nl802154_policy$SET_SHORT_ADDR]], f flags[send_flags])
+sendmsg$NL802154_CMD_SET_BACKOFF_EXPONENT(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_SET_BACKOFF_EXPONENT, nl802154_policy$SET_BACKOFF_EXPONENT]], f flags[send_flags])
+sendmsg$NL802154_CMD_SET_MAX_CSMA_BACKOFFS(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_SET_MAX_CSMA_BACKOFFS, nl802154_policy$SET_MAX_CSMA_BACKOFFS]], f flags[send_flags])
+sendmsg$NL802154_CMD_SET_MAX_FRAME_RETRIES(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_SET_MAX_FRAME_RETRIES, nl802154_policy$SET_MAX_FRAME_RETRIES]], f flags[send_flags])
+sendmsg$NL802154_CMD_SET_LBT_MODE(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_SET_LBT_MODE, nl802154_policy$SET_LBT_MODE]], f flags[send_flags])
+sendmsg$NL802154_CMD_SET_ACKREQ_DEFAULT(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_SET_ACKREQ_DEFAULT, nl802154_policy$SET_ACKREQ_DEFAULT]], f flags[send_flags])
+sendmsg$NL802154_CMD_SET_SEC_PARAMS(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_SET_SEC_PARAMS, nl802154_policy$SET_SEC_PARAMS]], f flags[send_flags])
+sendmsg$NL802154_CMD_GET_SEC_KEY(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_GET_SEC_KEY, nl802154_policy$GET_SEC_KEY]], f flags[send_flags])
+sendmsg$NL802154_CMD_NEW_SEC_KEY(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_NEW_SEC_KEY, nl802154_policy$NEW_SEC_KEY]], f flags[send_flags])
+sendmsg$NL802154_CMD_DEL_SEC_KEY(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_DEL_SEC_KEY, nl802154_policy$DEL_SEC_KEY]], f flags[send_flags])
+sendmsg$NL802154_CMD_GET_SEC_DEV(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_GET_SEC_DEV, nl802154_policy$GET_SEC_DEV]], f flags[send_flags])
+sendmsg$NL802154_CMD_NEW_SEC_DEV(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_NEW_SEC_DEV, nl802154_policy$NEW_SEC_DEV]], f flags[send_flags])
+sendmsg$NL802154_CMD_DEL_SEC_DEV(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_DEL_SEC_DEV, nl802154_policy$DEL_SEC_DEV]], f flags[send_flags])
+sendmsg$NL802154_CMD_GET_SEC_DEVKEY(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_GET_SEC_DEVKEY, nl802154_policy$GET_SEC_DEVKEY]], f flags[send_flags])
+sendmsg$NL802154_CMD_NEW_SEC_DEVKEY(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_NEW_SEC_DEVKEY, nl802154_policy$NEW_SEC_DEVKEY]], f flags[send_flags])
+sendmsg$NL802154_CMD_DEL_SEC_DEVKEY(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_DEL_SEC_DEVKEY, nl802154_policy$DEL_SEC_DEVKEY]], f flags[send_flags])
+sendmsg$NL802154_CMD_GET_SEC_LEVEL(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_GET_SEC_LEVEL, nl802154_policy$GET_SEC_LEVEL]], f flags[send_flags])
+sendmsg$NL802154_CMD_NEW_SEC_LEVEL(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_NEW_SEC_LEVEL, nl802154_policy$NEW_DEL_SEC_LEVEL]], f flags[send_flags])
+sendmsg$NL802154_CMD_DEL_SEC_LEVEL(fd sock_nl_generic_init, msg ptr[in, msghdr_nl802154[NL802154_CMD_DEL_SEC_LEVEL, nl802154_policy$NEW_DEL_SEC_LEVEL]], f flags[send_flags])
+
+nl802154_policy$GET_WPAN_PHY [
 	NL802154_ATTR_WPAN_PHY	nlattr[NL802154_ATTR_WPAN_PHY, flags[ieee802154_phy_index, int32]]
 	NL802154_ATTR_IFINDEX	nlattr[NL802154_ATTR_IFINDEX, ieee802154_ifindex]
 	NL802154_ATTR_WPAN_DEV	nlattr[NL802154_ATTR_WPAN_DEV, flags[ieee802154_dev_index, int64]]
 ] [varlen]
 
-nl802154_policy_GET_INTERFACE [
+nl802154_policy$GET_INTERFACE [
 	NL802154_ATTR_IFINDEX	nlattr[NL802154_ATTR_IFINDEX, ieee802154_ifindex]
 	NL802154_ATTR_WPAN_DEV	nlattr[NL802154_ATTR_WPAN_DEV, flags[ieee802154_dev_index, int64]]
 ] [varlen]
 
-nl802154_policy_NEW_INTERFACE [
+nl802154_policy$NEW_INTERFACE [
 	NL802154_ATTR_WPAN_PHY		nlattr[NL802154_ATTR_WPAN_PHY, flags[ieee802154_phy_index, int32]]
 	NL802154_ATTR_IFINDEX		nlattr[NL802154_ATTR_IFINDEX, ieee802154_ifindex]
 	NL802154_ATTR_WPAN_DEV		nlattr[NL802154_ATTR_WPAN_DEV, flags[ieee802154_dev_index, int64]]
@@ -108,12 +108,12 @@ nl802154_policy_NEW_INTERFACE [
 
 nl802154_iftype = NL802154_IFTYPE_UNSPEC, NL802154_IFTYPE_NODE, NL802154_IFTYPE_MONITOR, NL802154_IFTYPE_COORD
 
-#nl802154_policy_DEL_INTERFACE [
+#nl802154_policy$DEL_INTERFACE [
 #	NL802154_ATTR_IFINDEX	nlattr[NL802154_ATTR_IFINDEX, ieee802154_ifindex]
 #	NL802154_ATTR_WPAN_DEV	nlattr[NL802154_ATTR_WPAN_DEV, flags[ieee802154_dev_index, int64]]
 #] [varlen]
 
-nl802154_policy_SET_CHANNEL [
+nl802154_policy$SET_CHANNEL [
 	NL802154_ATTR_WPAN_PHY	nlattr[NL802154_ATTR_WPAN_PHY, flags[ieee802154_phy_index, int32]]
 	NL802154_ATTR_IFINDEX	nlattr[NL802154_ATTR_IFINDEX, ieee802154_ifindex]
 	NL802154_ATTR_WPAN_DEV	nlattr[NL802154_ATTR_WPAN_DEV, flags[ieee802154_dev_index, int64]]
@@ -121,7 +121,7 @@ nl802154_policy_SET_CHANNEL [
 	NL802154_ATTR_CHANNEL	nlattr[NL802154_ATTR_CHANNEL, int8[0:IEEE802154_MAX_CHANNEL]]
 ] [varlen]
 
-nl802154_policy_SET_CCA_MODE [
+nl802154_policy$SET_CCA_MODE [
 	NL802154_ATTR_WPAN_PHY	nlattr[NL802154_ATTR_WPAN_PHY, flags[ieee802154_phy_index, int32]]
 	NL802154_ATTR_IFINDEX	nlattr[NL802154_ATTR_IFINDEX, ieee802154_ifindex]
 	NL802154_ATTR_WPAN_DEV	nlattr[NL802154_ATTR_WPAN_DEV, flags[ieee802154_dev_index, int64]]
@@ -132,21 +132,21 @@ nl802154_policy_SET_CCA_MODE [
 nl802154_cca_modes = NL802154_CCA_ENERGY, NL802154_CCA_CARRIER, NL802154_CCA_ENERGY_CARRIER, NL802154_CCA_ALOHA, NL802154_CCA_UWB_SHR, NL802154_CCA_UWB_MULTIPLEXED
 nl802154_cca_opts = NL802154_CCA_OPT_ENERGY_CARRIER_AND, NL802154_CCA_OPT_ENERGY_CARRIER_OR
 
-nl802154_policy_SET_CCA_ED_LEVEL [
+nl802154_policy$SET_CCA_ED_LEVEL [
 	NL802154_ATTR_WPAN_PHY		nlattr[NL802154_ATTR_WPAN_PHY, flags[ieee802154_phy_index, int32]]
 	NL802154_ATTR_IFINDEX		nlattr[NL802154_ATTR_IFINDEX, ieee802154_ifindex]
 	NL802154_ATTR_WPAN_DEV		nlattr[NL802154_ATTR_WPAN_DEV, flags[ieee802154_dev_index, int64]]
 	NL802154_ATTR_CCA_ED_LEVEL	nlattr[NL802154_ATTR_CCA_ED_LEVEL, int32[0:16]]
 ] [varlen]
 
-nl802154_policy_SET_TX_POWER [
+nl802154_policy$SET_TX_POWER [
 	NL802154_ATTR_WPAN_PHY	nlattr[NL802154_ATTR_WPAN_PHY, flags[ieee802154_phy_index, int32]]
 	NL802154_ATTR_IFINDEX	nlattr[NL802154_ATTR_IFINDEX, ieee802154_ifindex]
 	NL802154_ATTR_WPAN_DEV	nlattr[NL802154_ATTR_WPAN_DEV, flags[ieee802154_dev_index, int64]]
 	NL802154_ATTR_TX_POWER	nlattr[NL802154_ATTR_TX_POWER, int32]
 ] [varlen]
 
-nl802154_policy_SET_WPAN_PHY_NETNS [
+nl802154_policy$SET_WPAN_PHY_NETNS [
 	NL802154_ATTR_WPAN_PHY	nlattr[NL802154_ATTR_WPAN_PHY, flags[ieee802154_phy_index, int32]]
 	NL802154_ATTR_IFINDEX	nlattr[NL802154_ATTR_IFINDEX, ieee802154_ifindex]
 	NL802154_ATTR_WPAN_DEV	nlattr[NL802154_ATTR_WPAN_DEV, flags[ieee802154_dev_index, int64]]
@@ -154,50 +154,50 @@ nl802154_policy_SET_WPAN_PHY_NETNS [
 	NL802154_ATTR_NETNS_FD	nlattr[NL802154_ATTR_NETNS_FD, fd_namespace]
 ] [varlen]
 
-nl802154_policy_SET_PAN_ID [
+nl802154_policy$SET_PAN_ID [
 	NL802154_ATTR_IFINDEX	nlattr[NL802154_ATTR_IFINDEX, ieee802154_ifindex]
 	NL802154_ATTR_WPAN_DEV	nlattr[NL802154_ATTR_WPAN_DEV, flags[ieee802154_dev_index, int64]]
 	NL802154_ATTR_PAN_ID	nlattr[NL802154_ATTR_PAN_ID, flags[ieee802154_pan_id, int16]]
 ] [varlen]
 
-nl802154_policy_SET_SHORT_ADDR [
+nl802154_policy$SET_SHORT_ADDR [
 	NL802154_ATTR_IFINDEX		nlattr[NL802154_ATTR_IFINDEX, ieee802154_ifindex]
 	NL802154_ATTR_WPAN_DEV		nlattr[NL802154_ATTR_WPAN_DEV, flags[ieee802154_dev_index, int64]]
 	NL802154_ATTR_SHORT_ADDR	nlattr[NL802154_ATTR_SHORT_ADDR, flags[ieee802154_short_addr, int16]]
 ] [varlen]
 
-nl802154_policy_SET_BACKOFF_EXPONENT [
+nl802154_policy$SET_BACKOFF_EXPONENT [
 	NL802154_ATTR_IFINDEX	nlattr[NL802154_ATTR_IFINDEX, ieee802154_ifindex]
 	NL802154_ATTR_WPAN_DEV	nlattr[NL802154_ATTR_WPAN_DEV, flags[ieee802154_dev_index, int64]]
 	NL802154_ATTR_MIN_BE	nlattr[NL802154_ATTR_MIN_BE, int8]
 	NL802154_ATTR_MAX_BE	nlattr[NL802154_ATTR_MAX_BE, int8]
 ] [varlen]
 
-nl802154_policy_SET_MAX_CSMA_BACKOFFS [
+nl802154_policy$SET_MAX_CSMA_BACKOFFS [
 	NL802154_ATTR_IFINDEX		nlattr[NL802154_ATTR_IFINDEX, ieee802154_ifindex]
 	NL802154_ATTR_WPAN_DEV		nlattr[NL802154_ATTR_WPAN_DEV, flags[ieee802154_dev_index, int64]]
 	NL802154_ATTR_MAX_CSMA_BACKOFFS	nlattr[NL802154_ATTR_MAX_CSMA_BACKOFFS, int8]
 ] [varlen]
 
-nl802154_policy_SET_MAX_FRAME_RETRIES [
+nl802154_policy$SET_MAX_FRAME_RETRIES [
 	NL802154_ATTR_IFINDEX		nlattr[NL802154_ATTR_IFINDEX, ieee802154_ifindex]
 	NL802154_ATTR_WPAN_DEV		nlattr[NL802154_ATTR_WPAN_DEV, flags[ieee802154_dev_index, int64]]
 	NL802154_ATTR_MAX_FRAME_RETRIES	nlattr[NL802154_ATTR_MAX_FRAME_RETRIES, int8]
 ] [varlen]
 
-nl802154_policy_SET_LBT_MODE [
+nl802154_policy$SET_LBT_MODE [
 	NL802154_ATTR_IFINDEX	nlattr[NL802154_ATTR_IFINDEX, ieee802154_ifindex]
 	NL802154_ATTR_WPAN_DEV	nlattr[NL802154_ATTR_WPAN_DEV, flags[ieee802154_dev_index, int64]]
 	NL802154_ATTR_LBT_MODE	nlattr[NL802154_ATTR_LBT_MODE, bool8]
 ] [varlen]
 
-nl802154_policy_SET_ACKREQ_DEFAULT [
+nl802154_policy$SET_ACKREQ_DEFAULT [
 	NL802154_ATTR_IFINDEX		nlattr[NL802154_ATTR_IFINDEX, ieee802154_ifindex]
 	NL802154_ATTR_WPAN_DEV		nlattr[NL802154_ATTR_WPAN_DEV, flags[ieee802154_dev_index, int64]]
 	NL802154_ATTR_ACKREQ_DEFAULT	nlattr[NL802154_ATTR_ACKREQ_DEFAULT, bool8]
 ] [varlen]
 
-nl802154_policy_SET_SEC_PARAMS [
+nl802154_policy$SET_SEC_PARAMS [
 	NL802154_ATTR_IFINDEX		nlattr[NL802154_ATTR_IFINDEX, ieee802154_ifindex]
 	NL802154_ATTR_WPAN_DEV		nlattr[NL802154_ATTR_WPAN_DEV, flags[ieee802154_dev_index, int64]]
 	NL802154_ATTR_SEC_ENABLED	nlattr[NL802154_ATTR_SEC_ENABLED, bool8]
@@ -206,12 +206,12 @@ nl802154_policy_SET_SEC_PARAMS [
 	NL802154_ATTR_SEC_FRAME_COUNTER	nlattr[NL802154_ATTR_SEC_FRAME_COUNTER, int32]
 ] [varlen]
 
-nl802154_policy_GET_SEC_KEY [
+nl802154_policy$GET_SEC_KEY [
 	NL802154_ATTR_IFINDEX	nlattr[NL802154_ATTR_IFINDEX, ieee802154_ifindex]
 	NL802154_ATTR_WPAN_DEV	nlattr[NL802154_ATTR_WPAN_DEV, flags[ieee802154_dev_index, int64]]
 ] [varlen]
 
-nl802154_policy_NEW_SEC_KEY [
+nl802154_policy$NEW_SEC_KEY [
 	NL802154_ATTR_IFINDEX	nlattr[NL802154_ATTR_IFINDEX, ieee802154_ifindex]
 	NL802154_ATTR_WPAN_DEV	nlattr[NL802154_ATTR_WPAN_DEV, flags[ieee802154_dev_index, int64]]
 	NL802154_ATTR_SEC_KEY	nlnest[NL802154_ATTR_SEC_KEY, array[nl802154_key_policy]]
@@ -239,18 +239,18 @@ nl802154_dev_addr_policy [
 	NL802154_DEV_ADDR_ATTR_EXTENDED	nlattr[NL802154_DEV_ADDR_ATTR_EXTENDED, ieee802154_hwaddr]
 ] [varlen]
 
-nl802154_policy_DEL_SEC_KEY [
+nl802154_policy$DEL_SEC_KEY [
 	NL802154_ATTR_IFINDEX	nlattr[NL802154_ATTR_IFINDEX, ieee802154_ifindex]
 	NL802154_ATTR_WPAN_DEV	nlattr[NL802154_ATTR_WPAN_DEV, flags[ieee802154_dev_index, int64]]
 	NL802154_ATTR_SEC_KEY	nlnest[NL802154_ATTR_SEC_KEY, array[nl802154_key_policy]]
 ] [varlen]
 
-nl802154_policy_GET_SEC_DEV [
+nl802154_policy$GET_SEC_DEV [
 	NL802154_ATTR_IFINDEX	nlattr[NL802154_ATTR_IFINDEX, ieee802154_ifindex]
 	NL802154_ATTR_WPAN_DEV	nlattr[NL802154_ATTR_WPAN_DEV, flags[ieee802154_dev_index, int64]]
 ] [varlen]
 
-nl802154_policy_NEW_SEC_DEV [
+nl802154_policy$NEW_SEC_DEV [
 	NL802154_ATTR_IFINDEX		nlattr[NL802154_ATTR_IFINDEX, ieee802154_ifindex]
 	NL802154_ATTR_WPAN_DEV		nlattr[NL802154_ATTR_WPAN_DEV, flags[ieee802154_dev_index, int64]]
 	NL802154_ATTR_SEC_DEVICE	nlnest[NL802154_ATTR_SEC_DEVICE, array[nl802154_dev_policy]]
@@ -265,18 +265,18 @@ nl802154_dev_policy [
 	NL802154_DEV_ATTR_KEY_MODE		nlattr[NL802154_DEV_ATTR_KEY_MODE, int32[0:NL802154_DEVKEY_MAX]]
 ] [varlen]
 
-nl802154_policy_DEL_SEC_DEV [
+nl802154_policy$DEL_SEC_DEV [
 	NL802154_ATTR_IFINDEX		nlattr[NL802154_ATTR_IFINDEX, ieee802154_ifindex]
 	NL802154_ATTR_WPAN_DEV		nlattr[NL802154_ATTR_WPAN_DEV, flags[ieee802154_dev_index, int64]]
 	NL802154_ATTR_SEC_DEVICE	nlnest[NL802154_ATTR_SEC_DEVICE, nlattr[NL802154_DEV_ATTR_EXTENDED_ADDR, ieee802154_hwaddr]]
 ] [varlen]
 
-nl802154_policy_GET_SEC_DEVKEY [
+nl802154_policy$GET_SEC_DEVKEY [
 	NL802154_ATTR_IFINDEX	nlattr[NL802154_ATTR_IFINDEX, ieee802154_ifindex]
 	NL802154_ATTR_WPAN_DEV	nlattr[NL802154_ATTR_WPAN_DEV, flags[ieee802154_dev_index, int64]]
 ] [varlen]
 
-nl802154_policy_NEW_SEC_DEVKEY [
+nl802154_policy$NEW_SEC_DEVKEY [
 	NL802154_ATTR_IFINDEX		nlattr[NL802154_ATTR_IFINDEX, ieee802154_ifindex]
 	NL802154_ATTR_WPAN_DEV		nlattr[NL802154_ATTR_WPAN_DEV, flags[ieee802154_dev_index, int64]]
 	NL802154_ATTR_SEC_DEVKEY	nlnest[NL802154_ATTR_SEC_DEVKEY, array[nl802154_devkey_policy]]
@@ -288,18 +288,18 @@ nl802154_devkey_policy [
 	NL802154_DEVKEY_ATTR_ID			nlnest[NL802154_DEVKEY_ATTR_ID, array[nl802154_key_id_policy]]
 ] [varlen]
 
-nl802154_policy_DEL_SEC_DEVKEY [
+nl802154_policy$DEL_SEC_DEVKEY [
 	NL802154_ATTR_IFINDEX		nlattr[NL802154_ATTR_IFINDEX, ieee802154_ifindex]
 	NL802154_ATTR_WPAN_DEV		nlattr[NL802154_ATTR_WPAN_DEV, flags[ieee802154_dev_index, int64]]
 	NL802154_ATTR_SEC_DEVKEY	nlnest[NL802154_ATTR_SEC_DEVKEY, array[nl802154_devkey_policy]]
 ] [varlen]
 
-nl802154_policy_GET_SEC_LEVEL [
+nl802154_policy$GET_SEC_LEVEL [
 	NL802154_ATTR_IFINDEX	nlattr[NL802154_ATTR_IFINDEX, ieee802154_ifindex]
 	NL802154_ATTR_WPAN_DEV	nlattr[NL802154_ATTR_WPAN_DEV, flags[ieee802154_dev_index, int64]]
 ] [varlen]
 
-nl802154_policy_NEW_DEL_SEC_LEVEL [
+nl802154_policy$NEW_DEL_SEC_LEVEL [
 	NL802154_ATTR_IFINDEX	nlattr[NL802154_ATTR_IFINDEX, ieee802154_ifindex]
 	NL802154_ATTR_WPAN_DEV	nlattr[NL802154_ATTR_WPAN_DEV, flags[ieee802154_dev_index, int64]]
 	NL802154_ATTR_SEC_LEVEL	nlnest[NL802154_ATTR_SEC_LEVEL, array[nl802154_seclevel_policy]]
@@ -318,44 +318,44 @@ type msghdr_ieee802154[CMD, POLICY] msghdr_netlink[netlink_msg_t[genl_ieee802154
 syz_genetlink_get_family_id$ieee802154(name ptr[in, string["802.15.4 MAC"]], fd sock_nl_generic_init) genl_ieee802154_family_id
 
 sendmsg$IEEE802154_LIST_PHY(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_LIST_PHY, void]], f flags[send_flags])
-sendmsg$IEEE802154_ADD_IFACE(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_ADD_IFACE, ieee802154_policy_ADD_IFACE]], f flags[send_flags])
+sendmsg$IEEE802154_ADD_IFACE(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_ADD_IFACE, ieee802154_policy$ADD_IFACE]], f flags[send_flags])
 # This is disabled as we only have 2 global hwsim devices, if we delete them we are out of devices.
-# sendmsg$IEEE802154_DEL_IFACE(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_DEL_IFACE, ieee802154_policy_DEL_IFACE]], f flags[send_flags])
-sendmsg$IEEE802154_ASSOCIATE_REQ(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_ASSOCIATE_REQ, ieee802154_policy_ASSOCIATE_REQ]], f flags[send_flags])
-sendmsg$IEEE802154_ASSOCIATE_RESP(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_ASSOCIATE_RESP, ieee802154_policy_ASSOCIATE_RESP]], f flags[send_flags])
-sendmsg$IEEE802154_DISASSOCIATE_REQ(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_DISASSOCIATE_REQ, ieee802154_policy_DISASSOCIATE_REQ]], f flags[send_flags])
-sendmsg$IEEE802154_SCAN_REQ(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_SCAN_REQ, ieee802154_policy_SCAN_REQ]], f flags[send_flags])
-sendmsg$IEEE802154_START_REQ(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_START_REQ, ieee802154_policy_START_REQ]], f flags[send_flags])
-sendmsg$IEEE802154_LIST_IFACE(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_LIST_IFACE, ieee802154_policy_LIST_IFACE]], f flags[send_flags])
-sendmsg$IEEE802154_SET_MACPARAMS(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_SET_MACPARAMS, ieee802154_policy_SET_MACPARAMS]], f flags[send_flags])
-sendmsg$IEEE802154_LLSEC_GETPARAMS(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_LLSEC_GETPARAMS, ieee802154_policy_LLSEC_GETPARAMS]], f flags[send_flags])
-sendmsg$IEEE802154_LLSEC_SETPARAMS(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_LLSEC_SETPARAMS, ieee802154_policy_LLSEC_SETPARAMS]], f flags[send_flags])
+# sendmsg$IEEE802154_DEL_IFACE(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_DEL_IFACE, ieee802154_policy$DEL_IFACE]], f flags[send_flags])
+sendmsg$IEEE802154_ASSOCIATE_REQ(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_ASSOCIATE_REQ, ieee802154_policy$ASSOCIATE_REQ]], f flags[send_flags])
+sendmsg$IEEE802154_ASSOCIATE_RESP(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_ASSOCIATE_RESP, ieee802154_policy$ASSOCIATE_RESP]], f flags[send_flags])
+sendmsg$IEEE802154_DISASSOCIATE_REQ(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_DISASSOCIATE_REQ, ieee802154_policy$DISASSOCIATE_REQ]], f flags[send_flags])
+sendmsg$IEEE802154_SCAN_REQ(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_SCAN_REQ, ieee802154_policy$SCAN_REQ]], f flags[send_flags])
+sendmsg$IEEE802154_START_REQ(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_START_REQ, ieee802154_policy$START_REQ]], f flags[send_flags])
+sendmsg$IEEE802154_LIST_IFACE(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_LIST_IFACE, ieee802154_policy$LIST_IFACE]], f flags[send_flags])
+sendmsg$IEEE802154_SET_MACPARAMS(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_SET_MACPARAMS, ieee802154_policy$SET_MACPARAMS]], f flags[send_flags])
+sendmsg$IEEE802154_LLSEC_GETPARAMS(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_LLSEC_GETPARAMS, ieee802154_policy$LLSEC_GETPARAMS]], f flags[send_flags])
+sendmsg$IEEE802154_LLSEC_SETPARAMS(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_LLSEC_SETPARAMS, ieee802154_policy$LLSEC_SETPARAMS]], f flags[send_flags])
 sendmsg$IEEE802154_LLSEC_LIST_KEY(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_LLSEC_LIST_KEY, void]], f flags[send_flags])
-sendmsg$IEEE802154_LLSEC_ADD_KEY(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_LLSEC_ADD_KEY, ieee802154_policy_LLSEC_ADD_KEY]], f flags[send_flags])
-sendmsg$IEEE802154_LLSEC_DEL_KEY(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_LLSEC_DEL_KEY, ieee802154_policy_LLSEC_DEL_KEY]], f flags[send_flags])
+sendmsg$IEEE802154_LLSEC_ADD_KEY(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_LLSEC_ADD_KEY, ieee802154_policy$LLSEC_ADD_KEY]], f flags[send_flags])
+sendmsg$IEEE802154_LLSEC_DEL_KEY(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_LLSEC_DEL_KEY, ieee802154_policy$LLSEC_DEL_KEY]], f flags[send_flags])
 sendmsg$IEEE802154_LLSEC_LIST_DEV(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_LLSEC_LIST_DEV, void]], f flags[send_flags])
-sendmsg$IEEE802154_LLSEC_ADD_DEV(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_LLSEC_ADD_DEV, ieee802154_policy_LLSEC_ADD_DEV]], f flags[send_flags])
-sendmsg$IEEE802154_LLSEC_DEL_DEV(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_LLSEC_DEL_DEV, ieee802154_policy_LLSEC_DEL_DEV]], f flags[send_flags])
+sendmsg$IEEE802154_LLSEC_ADD_DEV(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_LLSEC_ADD_DEV, ieee802154_policy$LLSEC_ADD_DEV]], f flags[send_flags])
+sendmsg$IEEE802154_LLSEC_DEL_DEV(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_LLSEC_DEL_DEV, ieee802154_policy$LLSEC_DEL_DEV]], f flags[send_flags])
 sendmsg$IEEE802154_LLSEC_LIST_DEVKEY(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_LLSEC_LIST_DEVKEY, void]], f flags[send_flags])
-sendmsg$IEEE802154_LLSEC_ADD_DEVKEY(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_LLSEC_ADD_DEVKEY, ieee802154_policy_LLSEC_ADD_DEVKEY]], f flags[send_flags])
-sendmsg$IEEE802154_LLSEC_DEL_DEVKEY(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_LLSEC_DEL_DEVKEY, ieee802154_policy_LLSEC_DEL_DEVKEY]], f flags[send_flags])
+sendmsg$IEEE802154_LLSEC_ADD_DEVKEY(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_LLSEC_ADD_DEVKEY, ieee802154_policy$LLSEC_ADD_DEVKEY]], f flags[send_flags])
+sendmsg$IEEE802154_LLSEC_DEL_DEVKEY(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_LLSEC_DEL_DEVKEY, ieee802154_policy$LLSEC_DEL_DEVKEY]], f flags[send_flags])
 sendmsg$IEEE802154_LLSEC_LIST_SECLEVEL(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_LLSEC_LIST_SECLEVEL, void]], f flags[send_flags])
-sendmsg$IEEE802154_LLSEC_ADD_SECLEVEL(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_LLSEC_ADD_SECLEVEL, ieee802154_policy_LLSEC_ADD_DEL_SECLEVEL]], f flags[send_flags])
-sendmsg$IEEE802154_LLSEC_DEL_SECLEVEL(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_LLSEC_DEL_SECLEVEL, ieee802154_policy_LLSEC_ADD_DEL_SECLEVEL]], f flags[send_flags])
+sendmsg$IEEE802154_LLSEC_ADD_SECLEVEL(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_LLSEC_ADD_SECLEVEL, ieee802154_policy$LLSEC_ADD_DEL_SECLEVEL]], f flags[send_flags])
+sendmsg$IEEE802154_LLSEC_DEL_SECLEVEL(fd sock_nl_generic_init, msg ptr[in, msghdr_ieee802154[IEEE802154_LLSEC_DEL_SECLEVEL, ieee802154_policy$LLSEC_ADD_DEL_SECLEVEL]], f flags[send_flags])
 
-ieee802154_policy_ADD_IFACE [
+ieee802154_policy$ADD_IFACE [
 	IEEE802154_ATTR_DEV_NAME	nlattr[IEEE802154_ATTR_DEV_NAME, string[ieee802154_dev_names]]
 	IEEE802154_ATTR_PHY_NAME	nlattr[IEEE802154_ATTR_PHY_NAME, string[ieee802154_phy_names]]
 	IEEE802154_ATTR_HW_ADDR		nlattr[IEEE802154_ATTR_HW_ADDR, ieee802154_hwaddr]
 	IEEE802154_ATTR_DEV_TYPE	nlattr[IEEE802154_ATTR_DEV_TYPE, int8[IEEE802154_DEV_WPAN:IEEE802154_DEV_MONITOR]]
 ] [varlen]
 
-#ieee802154_policy_DEL_IFACE [
+#ieee802154_policy$DEL_IFACE [
 #	IEEE802154_ATTR_DEV_NAME	nlattr[IEEE802154_ATTR_DEV_NAME, string[ieee802154_dev_names]]
 #	IEEE802154_ATTR_PHY_NAME	nlattr[IEEE802154_ATTR_PHY_NAME, string[ieee802154_phy_names]]
 #] [varlen]
 
-ieee802154_policy_ASSOCIATE_REQ [
+ieee802154_policy$ASSOCIATE_REQ [
 	IEEE802154_ATTR_CHANNEL			nlattr[IEEE802154_ATTR_CHANNEL, int8[0:IEEE802154_MAX_CHANNEL]]
 	IEEE802154_ATTR_COORD_PAN_ID		nlattr[IEEE802154_ATTR_COORD_PAN_ID, flags[ieee802154_pan_id, int16]]
 	IEEE802154_ATTR_COORD_HW_ADDR		nlattr[IEEE802154_ATTR_COORD_HW_ADDR, ieee802154_hwaddr]
@@ -364,26 +364,26 @@ ieee802154_policy_ASSOCIATE_REQ [
 	IEEE802154_ATTR_PAGE			nlattr[IEEE802154_ATTR_PAGE, int8[0:IEEE802154_MAX_PAGE]]
 ] [varlen]
 
-ieee802154_policy_ASSOCIATE_RESP [
+ieee802154_policy$ASSOCIATE_RESP [
 	IEEE802154_ATTR_STATUS			nlattr[IEEE802154_ATTR_STATUS, int8]
 	IEEE802154_ATTR_COORD_HW_ADDR		nlattr[IEEE802154_ATTR_COORD_HW_ADDR, ieee802154_hwaddr]
 	IEEE802154_ATTR_COORD_SHORT_ADDR	nlattr[IEEE802154_ATTR_COORD_SHORT_ADDR, flags[ieee802154_short_addr, int16]]
 ] [varlen]
 
-ieee802154_policy_DISASSOCIATE_REQ [
+ieee802154_policy$DISASSOCIATE_REQ [
 	IEEE802154_ATTR_REASON			nlattr[IEEE802154_ATTR_REASON, int8]
 	IEEE802154_ATTR_COORD_HW_ADDR		nlattr[IEEE802154_ATTR_COORD_HW_ADDR, ieee802154_hwaddr]
 	IEEE802154_ATTR_COORD_SHORT_ADDR	nlattr[IEEE802154_ATTR_COORD_SHORT_ADDR, flags[ieee802154_short_addr, int16]]
 ] [varlen]
 
-ieee802154_policy_SCAN_REQ [
+ieee802154_policy$SCAN_REQ [
 	IEEE802154_ATTR_SCAN_TYPE	nlattr[IEEE802154_ATTR_SCAN_TYPE, int8]
 	IEEE802154_ATTR_CHANNELS	nlattr[IEEE802154_ATTR_CHANNELS, int32[0:IEEE802154_MAX_CHANNEL]]
 	IEEE802154_ATTR_DURATION	nlattr[IEEE802154_ATTR_DURATION, int8]
 	IEEE802154_ATTR_PAGE		nlattr[IEEE802154_ATTR_PAGE, int8[0:IEEE802154_MAX_PAGE]]
 ] [varlen]
 
-ieee802154_policy_START_REQ [
+ieee802154_policy$START_REQ [
 	IEEE802154_ATTR_COORD_PAN_ID		nlattr[IEEE802154_ATTR_COORD_PAN_ID, flags[ieee802154_pan_id, int16]]
 	IEEE802154_ATTR_COORD_SHORT_ADDR	nlattr[IEEE802154_ATTR_COORD_SHORT_ADDR, flags[ieee802154_short_addr, int16]]
 	IEEE802154_ATTR_CHANNEL			nlattr[IEEE802154_ATTR_CHANNEL, int8[0:IEEE802154_MAX_CHANNEL]]
@@ -395,12 +395,12 @@ ieee802154_policy_START_REQ [
 	IEEE802154_ATTR_PAGE			nlattr[IEEE802154_ATTR_PAGE, int8[0:IEEE802154_MAX_PAGE]]
 ] [varlen]
 
-ieee802154_policy_LIST_IFACE [
+ieee802154_policy$LIST_IFACE [
 	IEEE802154_ATTR_DEV_NAME	nlattr[IEEE802154_ATTR_DEV_NAME, string[ieee802154_dev_names]]
 	IEEE802154_ATTR_DEV_INDEX	nlattr[IEEE802154_ATTR_DEV_INDEX, ieee802154_ifindex]
 ] [varlen]
 
-ieee802154_policy_SET_MACPARAMS [
+ieee802154_policy$SET_MACPARAMS [
 	IEEE802154_ATTR_DEV_NAME	nlattr[IEEE802154_ATTR_DEV_NAME, string[ieee802154_dev_names]]
 	IEEE802154_ATTR_DEV_INDEX	nlattr[IEEE802154_ATTR_DEV_INDEX, ieee802154_ifindex]
 	IEEE802154_ATTR_LBT_ENABLED	nlattr[IEEE802154_ATTR_LBT_ENABLED, bool8]
@@ -413,12 +413,12 @@ ieee802154_policy_SET_MACPARAMS [
 	IEEE802154_ATTR_TXPOWER		nlattr[IEEE802154_ATTR_TXPOWER, int8]
 ] [varlen]
 
-ieee802154_policy_LLSEC_GETPARAMS [
+ieee802154_policy$LLSEC_GETPARAMS [
 	IEEE802154_ATTR_DEV_NAME	nlattr[IEEE802154_ATTR_DEV_NAME, string[ieee802154_dev_names]]
 	IEEE802154_ATTR_DEV_INDEX	nlattr[IEEE802154_ATTR_DEV_INDEX, ieee802154_ifindex]
 ] [varlen]
 
-ieee802154_policy_LLSEC_SETPARAMS [
+ieee802154_policy$LLSEC_SETPARAMS [
 	IEEE802154_ATTR_DEV_NAME			nlattr[IEEE802154_ATTR_DEV_NAME, string[ieee802154_dev_names]]
 	IEEE802154_ATTR_DEV_INDEX			nlattr[IEEE802154_ATTR_DEV_INDEX, ieee802154_ifindex]
 	IEEE802154_ATTR_LLSEC_SECLEVEL			nlattr[IEEE802154_ATTR_LLSEC_SECLEVEL, int8[0:7]]
@@ -435,7 +435,7 @@ ieee802154_policy_LLSEC_SETPARAMS [
 
 ieee802154_scf_key = IEEE802154_SCF_KEY_IMPLICIT, IEEE802154_SCF_KEY_INDEX, IEEE802154_SCF_KEY_SHORT_INDEX, IEEE802154_SCF_KEY_HW_INDEX
 
-ieee802154_policy_LLSEC_ADD_KEY [
+ieee802154_policy$LLSEC_ADD_KEY [
 	IEEE802154_ATTR_DEV_NAME			nlattr[IEEE802154_ATTR_DEV_NAME, string[ieee802154_dev_names]]
 	IEEE802154_ATTR_DEV_INDEX			nlattr[IEEE802154_ATTR_DEV_INDEX, ieee802154_ifindex]
 	IEEE802154_ATTR_LLSEC_KEY_USAGE_FRAME_TYPES	nlattr[IEEE802154_ATTR_LLSEC_KEY_USAGE_FRAME_TYPES, int8]
@@ -450,7 +450,7 @@ ieee802154_policy_LLSEC_ADD_KEY [
 	IEEE802154_ATTR_LLSEC_KEY_SOURCE_EXTENDED	nlattr[IEEE802154_ATTR_LLSEC_KEY_SOURCE_EXTENDED, ieee802154_hwaddr]
 ] [varlen]
 
-ieee802154_policy_LLSEC_DEL_KEY [
+ieee802154_policy$LLSEC_DEL_KEY [
 	IEEE802154_ATTR_DEV_NAME			nlattr[IEEE802154_ATTR_DEV_NAME, string[ieee802154_dev_names]]
 	IEEE802154_ATTR_DEV_INDEX			nlattr[IEEE802154_ATTR_DEV_INDEX, ieee802154_ifindex]
 	IEEE802154_ATTR_LLSEC_KEY_MODE			nlattr[IEEE802154_ATTR_LLSEC_KEY_MODE, flags[ieee802154_scf_key, int8]]
@@ -462,7 +462,7 @@ ieee802154_policy_LLSEC_DEL_KEY [
 	IEEE802154_ATTR_LLSEC_KEY_SOURCE_EXTENDED	nlattr[IEEE802154_ATTR_LLSEC_KEY_SOURCE_EXTENDED, ieee802154_hwaddr]
 ] [varlen]
 
-ieee802154_policy_LLSEC_ADD_DEV [
+ieee802154_policy$LLSEC_ADD_DEV [
 	IEEE802154_ATTR_DEV_NAME		nlattr[IEEE802154_ATTR_DEV_NAME, string[ieee802154_dev_names]]
 	IEEE802154_ATTR_DEV_INDEX		nlattr[IEEE802154_ATTR_DEV_INDEX, ieee802154_ifindex]
 	IEEE802154_ATTR_LLSEC_FRAME_COUNTER	nlattr[IEEE802154_ATTR_LLSEC_FRAME_COUNTER, int32]
@@ -475,13 +475,13 @@ ieee802154_policy_LLSEC_ADD_DEV [
 
 ieee802154_devkey_mode = NL802154_DEVKEY_IGNORE, NL802154_DEVKEY_RESTRICT, NL802154_DEVKEY_RECORD
 
-ieee802154_policy_LLSEC_DEL_DEV [
+ieee802154_policy$LLSEC_DEL_DEV [
 	IEEE802154_ATTR_DEV_NAME	nlattr[IEEE802154_ATTR_DEV_NAME, string[ieee802154_dev_names]]
 	IEEE802154_ATTR_DEV_INDEX	nlattr[IEEE802154_ATTR_DEV_INDEX, ieee802154_ifindex]
 	IEEE802154_ATTR_HW_ADDR		nlattr[IEEE802154_ATTR_HW_ADDR, ieee802154_hwaddr]
 ] [varlen]
 
-ieee802154_policy_LLSEC_ADD_DEVKEY [
+ieee802154_policy$LLSEC_ADD_DEVKEY [
 	IEEE802154_ATTR_DEV_NAME			nlattr[IEEE802154_ATTR_DEV_NAME, string[ieee802154_dev_names]]
 	IEEE802154_ATTR_DEV_INDEX			nlattr[IEEE802154_ATTR_DEV_INDEX, ieee802154_ifindex]
 	IEEE802154_ATTR_LLSEC_FRAME_COUNTER		nlattr[IEEE802154_ATTR_LLSEC_FRAME_COUNTER, int32]
@@ -494,7 +494,7 @@ ieee802154_policy_LLSEC_ADD_DEVKEY [
 	IEEE802154_ATTR_LLSEC_KEY_SOURCE_EXTENDED	nlattr[IEEE802154_ATTR_LLSEC_KEY_SOURCE_EXTENDED, ieee802154_hwaddr]
 ] [varlen]
 
-ieee802154_policy_LLSEC_DEL_DEVKEY [
+ieee802154_policy$LLSEC_DEL_DEVKEY [
 	IEEE802154_ATTR_DEV_NAME			nlattr[IEEE802154_ATTR_DEV_NAME, string[ieee802154_dev_names]]
 	IEEE802154_ATTR_DEV_INDEX			nlattr[IEEE802154_ATTR_DEV_INDEX, ieee802154_ifindex]
 	IEEE802154_ATTR_HW_ADDR				nlattr[IEEE802154_ATTR_HW_ADDR, ieee802154_hwaddr]
@@ -506,7 +506,7 @@ ieee802154_policy_LLSEC_DEL_DEVKEY [
 	IEEE802154_ATTR_LLSEC_KEY_SOURCE_EXTENDED	nlattr[IEEE802154_ATTR_LLSEC_KEY_SOURCE_EXTENDED, ieee802154_hwaddr]
 ] [varlen]
 
-ieee802154_policy_LLSEC_ADD_DEL_SECLEVEL [
+ieee802154_policy$LLSEC_ADD_DEL_SECLEVEL [
 	IEEE802154_ATTR_DEV_NAME		nlattr[IEEE802154_ATTR_DEV_NAME, string[ieee802154_dev_names]]
 	IEEE802154_ATTR_DEV_INDEX		nlattr[IEEE802154_ATTR_DEV_INDEX, ieee802154_ifindex]
 	IEEE802154_ATTR_LLSEC_FRAME_TYPE	nlattr[IEEE802154_ATTR_LLSEC_FRAME_TYPE, int8]
diff --git a/sys/linux/socket_netlink_generic_80211.txt b/sys/linux/socket_netlink_generic_80211.txt
index dabc50781..270e98b46 100644
--- a/sys/linux/socket_netlink_generic_80211.txt
+++ b/sys/linux/socket_netlink_generic_80211.txt
@@ -32,112 +32,112 @@ syz_genetlink_get_family_id$nl80211(name ptr[in, string["nl80211"]], fd sock_nl_
 ioctl$sock_SIOCGIFINDEX_80211(fd sock, cmd const[SIOCGIFINDEX], arg ptr[out, ifreq_dev_t[nl80211_devnames, nl80211_ifindex]])
 
 sendmsg$NL80211_CMD_GET_WIPHY(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_rdev[NL80211_CMD_GET_WIPHY, void]], f flags[send_flags])
-sendmsg$NL80211_CMD_SET_WIPHY(fd sock_nl_generic, msg ptr[in, msghdr_nl80211[NL80211_CMD_SET_WIPHY, void, nl80211_policy_wiphy]], f flags[send_flags])
-sendmsg$NL80211_CMD_SET_WIPHY_NETNS(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_rdev[NL80211_CMD_SET_WIPHY_NETNS, nl80211_policy_setns]], f flags[send_flags])
+sendmsg$NL80211_CMD_SET_WIPHY(fd sock_nl_generic, msg ptr[in, msghdr_nl80211[NL80211_CMD_SET_WIPHY, void, nl80211_policy$wiphy]], f flags[send_flags])
+sendmsg$NL80211_CMD_SET_WIPHY_NETNS(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_rdev[NL80211_CMD_SET_WIPHY_NETNS, nl80211_policy$setns]], f flags[send_flags])
 sendmsg$NL80211_CMD_GET_INTERFACE(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_GET_INTERFACE, void]], f flags[send_flags])
-sendmsg$NL80211_CMD_SET_INTERFACE(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_INTERFACE, nl80211_policy_set_interface]], f flags[send_flags])
-sendmsg$NL80211_CMD_NEW_INTERFACE(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_rdev[NL80211_CMD_NEW_INTERFACE, nl80211_policy_new_interface]], f flags[send_flags])
+sendmsg$NL80211_CMD_SET_INTERFACE(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_INTERFACE, nl80211_policy$set_interface]], f flags[send_flags])
+sendmsg$NL80211_CMD_NEW_INTERFACE(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_rdev[NL80211_CMD_NEW_INTERFACE, nl80211_policy$new_interface]], f flags[send_flags])
 sendmsg$NL80211_CMD_DEL_INTERFACE(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_DEL_INTERFACE, void]], f flags[send_flags])
-sendmsg$NL80211_CMD_GET_KEY(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_GET_KEY, nl80211_policy_cmd_key]], f flags[send_flags])
-sendmsg$NL80211_CMD_SET_KEY(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_KEY, nl80211_policy_cmd_key]], f flags[send_flags])
-sendmsg$NL80211_CMD_NEW_KEY(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_NEW_KEY, nl80211_policy_cmd_key]], f flags[send_flags])
-sendmsg$NL80211_CMD_DEL_KEY(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_DEL_KEY, nl80211_policy_cmd_key]], f flags[send_flags])
-sendmsg$NL80211_CMD_SET_BEACON(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_BEACON, nl80211_policy_beacon]], f flags[send_flags])
-sendmsg$NL80211_CMD_START_AP(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_START_AP, nl80211_policy_start_ap]], f flags[send_flags])
+sendmsg$NL80211_CMD_GET_KEY(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_GET_KEY, nl80211_policy$cmd_key]], f flags[send_flags])
+sendmsg$NL80211_CMD_SET_KEY(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_KEY, nl80211_policy$cmd_key]], f flags[send_flags])
+sendmsg$NL80211_CMD_NEW_KEY(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_NEW_KEY, nl80211_policy$cmd_key]], f flags[send_flags])
+sendmsg$NL80211_CMD_DEL_KEY(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_DEL_KEY, nl80211_policy$cmd_key]], f flags[send_flags])
+sendmsg$NL80211_CMD_SET_BEACON(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_BEACON, nl80211_policy$beacon]], f flags[send_flags])
+sendmsg$NL80211_CMD_START_AP(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_START_AP, nl80211_policy$start_ap]], f flags[send_flags])
 sendmsg$NL80211_CMD_STOP_AP(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_STOP_AP, void]], f flags[send_flags])
-sendmsg$NL80211_CMD_GET_STATION(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_GET_STATION, nl80211_policy_station]], f flags[send_flags])
-sendmsg$NL80211_CMD_SET_STATION(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_STATION, nl80211_policy_station]], f flags[send_flags])
-sendmsg$NL80211_CMD_NEW_STATION(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_NEW_STATION, nl80211_policy_station]], f flags[send_flags])
-sendmsg$NL80211_CMD_DEL_STATION(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_DEL_STATION, nl80211_policy_station]], f flags[send_flags])
-sendmsg$NL80211_CMD_GET_MPATH(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_GET_MPATH, nl80211_policy_mpath]], f flags[send_flags])
-sendmsg$NL80211_CMD_SET_MPATH(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_MPATH, nl80211_policy_mpath]], f flags[send_flags])
-sendmsg$NL80211_CMD_NEW_MPATH(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_NEW_MPATH, nl80211_policy_mpath]], f flags[send_flags])
-sendmsg$NL80211_CMD_DEL_MPATH(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_DEL_MPATH, nl80211_policy_mpath]], f flags[send_flags])
-sendmsg$NL80211_CMD_GET_MPP(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_GET_MPP, nl80211_policy_mpath]], f flags[send_flags])
-sendmsg$NL80211_CMD_SET_BSS(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_BSS, nl80211_policy_bss]], f flags[send_flags])
-sendmsg$NL80211_CMD_GET_REG(fd sock_nl_generic, msg ptr[in, msghdr_nl80211[NL80211_CMD_GET_REG, void, nl80211_policy_reg]], f flags[send_flags])
-sendmsg$NL80211_CMD_SET_REG(fd sock_nl_generic, msg ptr[in, msghdr_nl80211[NL80211_CMD_SET_REG, void, nl80211_policy_reg]], f flags[send_flags])
-sendmsg$NL80211_CMD_REQ_SET_REG(fd sock_nl_generic, msg ptr[in, msghdr_nl80211[NL80211_CMD_REQ_SET_REG, void, nl80211_policy_reg]], f flags[send_flags])
+sendmsg$NL80211_CMD_GET_STATION(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_GET_STATION, nl80211_policy$station]], f flags[send_flags])
+sendmsg$NL80211_CMD_SET_STATION(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_STATION, nl80211_policy$station]], f flags[send_flags])
+sendmsg$NL80211_CMD_NEW_STATION(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_NEW_STATION, nl80211_policy$station]], f flags[send_flags])
+sendmsg$NL80211_CMD_DEL_STATION(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_DEL_STATION, nl80211_policy$station]], f flags[send_flags])
+sendmsg$NL80211_CMD_GET_MPATH(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_GET_MPATH, nl80211_policy$mpath]], f flags[send_flags])
+sendmsg$NL80211_CMD_SET_MPATH(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_MPATH, nl80211_policy$mpath]], f flags[send_flags])
+sendmsg$NL80211_CMD_NEW_MPATH(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_NEW_MPATH, nl80211_policy$mpath]], f flags[send_flags])
+sendmsg$NL80211_CMD_DEL_MPATH(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_DEL_MPATH, nl80211_policy$mpath]], f flags[send_flags])
+sendmsg$NL80211_CMD_GET_MPP(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_GET_MPP, nl80211_policy$mpath]], f flags[send_flags])
+sendmsg$NL80211_CMD_SET_BSS(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_BSS, nl80211_policy$bss]], f flags[send_flags])
+sendmsg$NL80211_CMD_GET_REG(fd sock_nl_generic, msg ptr[in, msghdr_nl80211[NL80211_CMD_GET_REG, void, nl80211_policy$reg]], f flags[send_flags])
+sendmsg$NL80211_CMD_SET_REG(fd sock_nl_generic, msg ptr[in, msghdr_nl80211[NL80211_CMD_SET_REG, void, nl80211_policy$reg]], f flags[send_flags])
+sendmsg$NL80211_CMD_REQ_SET_REG(fd sock_nl_generic, msg ptr[in, msghdr_nl80211[NL80211_CMD_REQ_SET_REG, void, nl80211_policy$reg]], f flags[send_flags])
 sendmsg$NL80211_CMD_GET_MESH_CONFIG(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_GET_MESH_CONFIG, void]], f flags[send_flags])
-sendmsg$NL80211_CMD_SET_MESH_CONFIG(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_MESH_CONFIG, nl80211_policy_mesh]], f flags[send_flags])
-sendmsg$NL80211_CMD_JOIN_MESH(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_JOIN_MESH, nl80211_policy_join_mesh]], f flags[send_flags])
+sendmsg$NL80211_CMD_SET_MESH_CONFIG(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_MESH_CONFIG, nl80211_policy$mesh]], f flags[send_flags])
+sendmsg$NL80211_CMD_JOIN_MESH(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_JOIN_MESH, nl80211_policy$join_mesh]], f flags[send_flags])
 sendmsg$NL80211_CMD_LEAVE_MESH(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_LEAVE_MESH, void]], f flags[send_flags])
-sendmsg$NL80211_CMD_TRIGGER_SCAN(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_TRIGGER_SCAN, nl80211_policy_scan]], f flags[send_flags])
+sendmsg$NL80211_CMD_TRIGGER_SCAN(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_TRIGGER_SCAN, nl80211_policy$scan]], f flags[send_flags])
 sendmsg$NL80211_CMD_GET_SCAN(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_GET_SCAN, void]], f flags[send_flags])
-sendmsg$NL80211_CMD_START_SCHED_SCAN(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_START_SCHED_SCAN, nl80211_policy_scan]], f flags[send_flags])
-sendmsg$NL80211_CMD_STOP_SCHED_SCAN(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_STOP_SCHED_SCAN, nl80211_policy_cookie]], f flags[send_flags])
-sendmsg$NL80211_CMD_JOIN_IBSS(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_JOIN_IBSS, nl80211_policy_join_ibss]], f flags[send_flags])
+sendmsg$NL80211_CMD_START_SCHED_SCAN(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_START_SCHED_SCAN, nl80211_policy$scan]], f flags[send_flags])
+sendmsg$NL80211_CMD_STOP_SCHED_SCAN(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_STOP_SCHED_SCAN, nl80211_policy$cookie]], f flags[send_flags])
+sendmsg$NL80211_CMD_JOIN_IBSS(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_JOIN_IBSS, nl80211_policy$join_ibss]], f flags[send_flags])
 sendmsg$NL80211_CMD_LEAVE_IBSS(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_LEAVE_IBSS, void]], f flags[send_flags])
-sendmsg$NL80211_CMD_CONNECT(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_CONNECT, nl80211_policy_connect]], f flags[send_flags])
-sendmsg$NL80211_CMD_DISCONNECT(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_DISCONNECT, nl80211_policy_disconnect]], f flags[send_flags])
+sendmsg$NL80211_CMD_CONNECT(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_CONNECT, nl80211_policy$connect]], f flags[send_flags])
+sendmsg$NL80211_CMD_DISCONNECT(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_DISCONNECT, nl80211_policy$disconnect]], f flags[send_flags])
 sendmsg$NL80211_CMD_UNEXPECTED_FRAME(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_UNEXPECTED_FRAME, void]], f flags[send_flags])
-sendmsg$NL80211_CMD_NOTIFY_RADAR(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_NOTIFY_RADAR, nl80211_policy_chandef_params]], f flags[send_flags])
-sendmsg$NL80211_CMD_RADAR_DETECT(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_RADAR_DETECT, nl80211_policy_chandef_params]], f flags[send_flags])
+sendmsg$NL80211_CMD_NOTIFY_RADAR(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_NOTIFY_RADAR, nl80211_policy$chandef_params]], f flags[send_flags])
+sendmsg$NL80211_CMD_RADAR_DETECT(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_RADAR_DETECT, nl80211_policy$chandef_params]], f flags[send_flags])
 sendmsg$NL80211_CMD_PEER_MEASUREMENT_START(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_PEER_MEASUREMENT_START, nl80211_pmsr_attr_policy]], f flags[send_flags])
-sendmsg$NL80211_CMD_UPDATE_OWE_INFO(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_UPDATE_OWE_INFO, nl80211_policy_upd_owe_info]], f flags[send_flags])
+sendmsg$NL80211_CMD_UPDATE_OWE_INFO(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_UPDATE_OWE_INFO, nl80211_policy$upd_owe_info]], f flags[send_flags])
 sendmsg$NL80211_CMD_GET_SURVEY(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_GET_SURVEY, void]], f flags[send_flags])
 sendmsg$NL80211_CMD_GET_COALESCE(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_rdev[NL80211_CMD_GET_COALESCE, void]], f flags[send_flags])
 sendmsg$NL80211_CMD_GET_FTM_RESPONDER_STATS(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_GET_FTM_RESPONDER_STATS, void]], f flags[send_flags])
-sendmsg$NL80211_CMD_ADD_NAN_FUNCTION(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_ADD_NAN_FUNCTION, nl80211_policy_add_nan_func]], f flags[send_flags])
-sendmsg$NL80211_CMD_DEL_NAN_FUNCTION(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_DEL_NAN_FUNCTION, nl80211_policy_del_nan_func]], f flags[send_flags])
-sendmsg$NL80211_CMD_START_NAN(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_START_NAN, nl80211_policy_start_nan]], f flags[send_flags])
+sendmsg$NL80211_CMD_ADD_NAN_FUNCTION(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_ADD_NAN_FUNCTION, nl80211_policy$add_nan_func]], f flags[send_flags])
+sendmsg$NL80211_CMD_DEL_NAN_FUNCTION(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_DEL_NAN_FUNCTION, nl80211_policy$del_nan_func]], f flags[send_flags])
+sendmsg$NL80211_CMD_START_NAN(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_START_NAN, nl80211_policy$start_nan]], f flags[send_flags])
 sendmsg$NL80211_CMD_STOP_NAN(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_STOP_NAN, void]], f flags[send_flags])
-sendmsg$NL80211_CMD_CHANGE_NAN_CONFIG(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_CHANGE_NAN_CONFIG, nl80211_policy_start_nan]], f flags[send_flags])
-sendmsg$NL80211_CMD_PROBE_CLIENT(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_PROBE_CLIENT, nl80211_policy_probe_client]], f flags[send_flags])
-sendmsg$NL80211_CMD_SET_CHANNEL(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_CHANNEL, nl80211_policy_chandef_params]], f flags[send_flags])
+sendmsg$NL80211_CMD_CHANGE_NAN_CONFIG(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_CHANGE_NAN_CONFIG, nl80211_policy$start_nan]], f flags[send_flags])
+sendmsg$NL80211_CMD_PROBE_CLIENT(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_PROBE_CLIENT, nl80211_policy$probe_client]], f flags[send_flags])
+sendmsg$NL80211_CMD_SET_CHANNEL(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_CHANNEL, nl80211_policy$chandef_params]], f flags[send_flags])
 sendmsg$NL80211_CMD_SET_COALESCE(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_COALESCE, nl80211_coalesce_policy]], f flags[send_flags])
-sendmsg$NL80211_CMD_SET_MAC_ACL(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_MAC_ACL, nl80211_policy_acl]], f flags[send_flags])
-sendmsg$NL80211_CMD_SET_MCAST_RATE(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_MCAST_RATE, nl80211_policy_set_mcast_rate]], f flags[send_flags])
-sendmsg$NL80211_CMD_SET_MULTICAST_TO_UNICAST(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_MULTICAST_TO_UNICAST, nl80211_policy_set_mcast_to_ucast]], f flags[send_flags])
-sendmsg$NL80211_CMD_SET_NOACK_MAP(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_NOACK_MAP, nl80211_policy_set_noack_map]], f flags[send_flags])
-sendmsg$NL80211_CMD_SET_PMK(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_PMK, nl80211_policy_set_pmk]], f flags[send_flags])
-sendmsg$NL80211_CMD_DEL_PMK(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_DEL_PMK, nl80211_policy_del_pmk]], f flags[send_flags])
-sendmsg$NL80211_CMD_SET_PMKSA(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_PMKSA, nl80211_policy_setdel_pmksa]], f flags[send_flags])
-sendmsg$NL80211_CMD_DEL_PMKSA(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_DEL_PMKSA, nl80211_policy_setdel_pmksa]], f flags[send_flags])
+sendmsg$NL80211_CMD_SET_MAC_ACL(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_MAC_ACL, nl80211_policy$acl]], f flags[send_flags])
+sendmsg$NL80211_CMD_SET_MCAST_RATE(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_MCAST_RATE, nl80211_policy$set_mcast_rate]], f flags[send_flags])
+sendmsg$NL80211_CMD_SET_MULTICAST_TO_UNICAST(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_MULTICAST_TO_UNICAST, nl80211_policy$set_mcast_to_ucast]], f flags[send_flags])
+sendmsg$NL80211_CMD_SET_NOACK_MAP(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_NOACK_MAP, nl80211_policy$set_noack_map]], f flags[send_flags])
+sendmsg$NL80211_CMD_SET_PMK(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_PMK, nl80211_policy$set_pmk]], f flags[send_flags])
+sendmsg$NL80211_CMD_DEL_PMK(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_DEL_PMK, nl80211_policy$del_pmk]], f flags[send_flags])
+sendmsg$NL80211_CMD_SET_PMKSA(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_PMKSA, nl80211_policy$setdel_pmksa]], f flags[send_flags])
+sendmsg$NL80211_CMD_DEL_PMKSA(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_DEL_PMKSA, nl80211_policy$setdel_pmksa]], f flags[send_flags])
 sendmsg$NL80211_CMD_FLUSH_PMKSA(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_FLUSH_PMKSA, void]], f flags[send_flags])
-sendmsg$NL80211_CMD_FRAME_WAIT_CANCEL(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_FRAME_WAIT_CANCEL, nl80211_policy_cookie]], f flags[send_flags])
+sendmsg$NL80211_CMD_FRAME_WAIT_CANCEL(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_FRAME_WAIT_CANCEL, nl80211_policy$cookie]], f flags[send_flags])
 sendmsg$NL80211_CMD_ABORT_SCAN(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_ABORT_SCAN, void]], f flags[send_flags])
-sendmsg$NL80211_CMD_SET_POWER_SAVE(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_POWER_SAVE, nl80211_policy_power_save]], f flags[send_flags])
+sendmsg$NL80211_CMD_SET_POWER_SAVE(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_POWER_SAVE, nl80211_policy$power_save]], f flags[send_flags])
 sendmsg$NL80211_CMD_GET_POWER_SAVE(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_GET_POWER_SAVE, void]], f flags[send_flags])
-sendmsg$NL80211_CMD_REMAIN_ON_CHANNEL(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_REMAIN_ON_CHANNEL, nl80211_policy_remain_on_ch]], f flags[send_flags])
-sendmsg$NL80211_CMD_CANCEL_REMAIN_ON_CHANNEL(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_CANCEL_REMAIN_ON_CHANNEL, nl80211_policy_cookie]], f flags[send_flags])
-sendmsg$NL80211_CMD_UPDATE_FT_IES(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_UPDATE_FT_IES, nl80211_policy_update_ft_ies]], f flags[send_flags])
-sendmsg$NL80211_CMD_VENDOR(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_rdev[NL80211_CMD_VENDOR, nl80211_policy_vendor]], f flags[send_flags])
-sendmsg$NL80211_CMD_SET_QOS_MAP(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_QOS_MAP, nl80211_policy_set_qos_map]], f flags[send_flags])
-sendmsg$NL80211_CMD_SET_CQM(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_CQM, nl80211_policy_cqm]], f flags[send_flags])
+sendmsg$NL80211_CMD_REMAIN_ON_CHANNEL(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_REMAIN_ON_CHANNEL, nl80211_policy$remain_on_ch]], f flags[send_flags])
+sendmsg$NL80211_CMD_CANCEL_REMAIN_ON_CHANNEL(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_CANCEL_REMAIN_ON_CHANNEL, nl80211_policy$cookie]], f flags[send_flags])
+sendmsg$NL80211_CMD_UPDATE_FT_IES(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_UPDATE_FT_IES, nl80211_policy$update_ft_ies]], f flags[send_flags])
+sendmsg$NL80211_CMD_VENDOR(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_rdev[NL80211_CMD_VENDOR, nl80211_policy$vendor]], f flags[send_flags])
+sendmsg$NL80211_CMD_SET_QOS_MAP(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_QOS_MAP, nl80211_policy$set_qos_map]], f flags[send_flags])
+sendmsg$NL80211_CMD_SET_CQM(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_CQM, nl80211_policy$cqm]], f flags[send_flags])
 sendmsg$NL80211_CMD_RELOAD_REGDB(fd sock_nl_generic, msg ptr[in, msghdr_nl80211[NL80211_CMD_RELOAD_REGDB, void, void]], f flags[send_flags])
 sendmsg$NL80211_CMD_LEAVE_OCB(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_LEAVE_OCB, void]], f flags[send_flags])
-sendmsg$NL80211_CMD_FRAME(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_FRAME, nl80211_policy_mgmt_frame]], f flags[send_flags])
-sendmsg$NL80211_CMD_ADD_TX_TS(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_ADD_TX_TS, nl80211_policy_add_tx_ts]], f flags[send_flags])
-sendmsg$NL80211_CMD_DEL_TX_TS(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_DEL_TX_TS, nl80211_policy_del_tx_ts]], f flags[send_flags])
-sendmsg$NL80211_CMD_AUTHENTICATE(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_AUTHENTICATE, nl80211_policy_authenticate]], f flags[send_flags])
-sendmsg$NL80211_CMD_DEAUTHENTICATE(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_DEAUTHENTICATE, nl80211_policy_de_auth_assoc]], f flags[send_flags])
-sendmsg$NL80211_CMD_ASSOCIATE(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_ASSOCIATE, nl80211_policy_associate]], f flags[send_flags])
-sendmsg$NL80211_CMD_DISASSOCIATE(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_DISASSOCIATE, nl80211_policy_de_auth_assoc]], f flags[send_flags])
-sendmsg$NL80211_CMD_EXTERNAL_AUTH(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_EXTERNAL_AUTH, nl80211_policy_ext_auth]], f flags[send_flags])
-sendmsg$NL80211_CMD_SET_REKEY_OFFLOAD(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_REKEY_OFFLOAD, nl80211_policy_rekey_offload]], f flags[send_flags])
+sendmsg$NL80211_CMD_FRAME(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_FRAME, nl80211_policy$mgmt_frame]], f flags[send_flags])
+sendmsg$NL80211_CMD_ADD_TX_TS(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_ADD_TX_TS, nl80211_policy$add_tx_ts]], f flags[send_flags])
+sendmsg$NL80211_CMD_DEL_TX_TS(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_DEL_TX_TS, nl80211_policy$del_tx_ts]], f flags[send_flags])
+sendmsg$NL80211_CMD_AUTHENTICATE(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_AUTHENTICATE, nl80211_policy$authenticate]], f flags[send_flags])
+sendmsg$NL80211_CMD_DEAUTHENTICATE(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_DEAUTHENTICATE, nl80211_policy$de_auth_assoc]], f flags[send_flags])
+sendmsg$NL80211_CMD_ASSOCIATE(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_ASSOCIATE, nl80211_policy$associate]], f flags[send_flags])
+sendmsg$NL80211_CMD_DISASSOCIATE(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_DISASSOCIATE, nl80211_policy$de_auth_assoc]], f flags[send_flags])
+sendmsg$NL80211_CMD_EXTERNAL_AUTH(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_EXTERNAL_AUTH, nl80211_policy$ext_auth]], f flags[send_flags])
+sendmsg$NL80211_CMD_SET_REKEY_OFFLOAD(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_REKEY_OFFLOAD, nl80211_policy$rekey_offload]], f flags[send_flags])
 sendmsg$NL80211_CMD_GET_PROTOCOL_FEATURES(fd sock_nl_generic, msg ptr[in, msghdr_nl80211[NL80211_CMD_GET_PROTOCOL_FEATURES, void, void]], f flags[send_flags])
-sendmsg$NL80211_CMD_SET_WDS_PEER(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_WDS_PEER, nl80211_policy_set_wds_peer]], f flags[send_flags])
-sendmsg$NL80211_CMD_SET_TID_CONFIG(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_TID_CONFIG, nl80211_policy_set_tid_config]], f flags[send_flags])
-sendmsg$NL80211_CMD_UPDATE_CONNECT_PARAMS(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_UPDATE_CONNECT_PARAMS, nl80211_policy_upd_connect_params]], f flags[send_flags])
-sendmsg$NL80211_CMD_TDLS_MGMT(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_TDLS_MGMT, nl80211_policy_tdls_mgmt]], f flags[send_flags])
-sendmsg$NL80211_CMD_TDLS_OPER(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_TDLS_OPER, nl80211_policy_tdls_oper]], f flags[send_flags])
-sendmsg$NL80211_CMD_JOIN_OCB(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_JOIN_OCB, nl80211_policy_chandef_params]], f flags[send_flags])
-sendmsg$NL80211_CMD_CONTROL_PORT_FRAME(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_CONTROL_PORT_FRAME, nl80211_policy_control_port]], f flags[send_flags])
-sendmsg$NL80211_CMD_CRIT_PROTOCOL_START(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_CRIT_PROTOCOL_START, nl80211_policy_crit_proto_start]], f flags[send_flags])
+sendmsg$NL80211_CMD_SET_WDS_PEER(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_WDS_PEER, nl80211_policy$set_wds_peer]], f flags[send_flags])
+sendmsg$NL80211_CMD_SET_TID_CONFIG(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_TID_CONFIG, nl80211_policy$set_tid_config]], f flags[send_flags])
+sendmsg$NL80211_CMD_UPDATE_CONNECT_PARAMS(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_UPDATE_CONNECT_PARAMS, nl80211_policy$upd_connect_params]], f flags[send_flags])
+sendmsg$NL80211_CMD_TDLS_MGMT(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_TDLS_MGMT, nl80211_policy$tdls_mgmt]], f flags[send_flags])
+sendmsg$NL80211_CMD_TDLS_OPER(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_TDLS_OPER, nl80211_policy$tdls_oper]], f flags[send_flags])
+sendmsg$NL80211_CMD_JOIN_OCB(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_JOIN_OCB, nl80211_policy$chandef_params]], f flags[send_flags])
+sendmsg$NL80211_CMD_CONTROL_PORT_FRAME(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_CONTROL_PORT_FRAME, nl80211_policy$control_port]], f flags[send_flags])
+sendmsg$NL80211_CMD_CRIT_PROTOCOL_START(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_CRIT_PROTOCOL_START, nl80211_policy$crit_proto_start]], f flags[send_flags])
 sendmsg$NL80211_CMD_CRIT_PROTOCOL_STOP(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_CRIT_PROTOCOL_STOP, void]], f flags[send_flags])
-sendmsg$NL80211_CMD_PROBE_MESH_LINK(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_PROBE_MESH_LINK, nl80211_policy_probe_mesh_link]], f flags[send_flags])
+sendmsg$NL80211_CMD_PROBE_MESH_LINK(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_PROBE_MESH_LINK, nl80211_policy$probe_mesh_link]], f flags[send_flags])
 sendmsg$NL80211_CMD_REGISTER_BEACONS(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_rdev[NL80211_CMD_REGISTER_BEACONS, void]], f flags[send_flags])
-sendmsg$NL80211_CMD_REGISTER_FRAME(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_REGISTER_FRAME, nl80211_policy_register_mgmt]], f flags[send_flags])
-sendmsg$NL80211_CMD_TDLS_CHANNEL_SWITCH(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_TDLS_CHANNEL_SWITCH, nl80211_policy_tdls_chsw]], f flags[send_flags])
-sendmsg$NL80211_CMD_TDLS_CANCEL_CHANNEL_SWITCH(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_TDLS_CANCEL_CHANNEL_SWITCH, nl80211_policy_tdls_chsw_cancel]], f flags[send_flags])
-sendmsg$NL80211_CMD_CHANNEL_SWITCH(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_CHANNEL_SWITCH, nl80211_policy_chsw]], f flags[send_flags])
+sendmsg$NL80211_CMD_REGISTER_FRAME(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_REGISTER_FRAME, nl80211_policy$register_mgmt]], f flags[send_flags])
+sendmsg$NL80211_CMD_TDLS_CHANNEL_SWITCH(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_TDLS_CHANNEL_SWITCH, nl80211_policy$tdls_chsw]], f flags[send_flags])
+sendmsg$NL80211_CMD_TDLS_CANCEL_CHANNEL_SWITCH(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_TDLS_CANCEL_CHANNEL_SWITCH, nl80211_policy$tdls_chsw_cancel]], f flags[send_flags])
+sendmsg$NL80211_CMD_CHANNEL_SWITCH(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_CHANNEL_SWITCH, nl80211_policy$chsw]], f flags[send_flags])
 sendmsg$NL80211_CMD_START_P2P_DEVICE(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_START_P2P_DEVICE, void]], f flags[send_flags])
 sendmsg$NL80211_CMD_STOP_P2P_DEVICE(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_STOP_P2P_DEVICE, void]], f flags[send_flags])
 sendmsg$NL80211_CMD_GET_WOWLAN(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_rdev[NL80211_CMD_GET_WOWLAN, void]], f flags[send_flags])
-sendmsg$NL80211_CMD_SET_WOWLAN(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_rdev[NL80211_CMD_SET_WOWLAN, nl80211_policy_set_wowlan]], f flags[send_flags])
-sendmsg$NL80211_CMD_TESTMODE(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_TESTMODE, nl80211_policy_testmode]], f flags[send_flags])
-sendmsg$NL80211_CMD_SET_TX_BITRATE_MASK(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_TX_BITRATE_MASK, nl80211_policy_set_tx_bitrate]], f flags[send_flags])
+sendmsg$NL80211_CMD_SET_WOWLAN(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_rdev[NL80211_CMD_SET_WOWLAN, nl80211_policy$set_wowlan]], f flags[send_flags])
+sendmsg$NL80211_CMD_TESTMODE(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_TESTMODE, nl80211_policy$testmode]], f flags[send_flags])
+sendmsg$NL80211_CMD_SET_TX_BITRATE_MASK(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_SET_TX_BITRATE_MASK, nl80211_policy$set_tx_bitrate]], f flags[send_flags])
 
 nl80211_wdev_payload {
 	NL80211_ATTR_IFINDEX	optional[nlattr[NL80211_ATTR_IFINDEX, nl80211_ifindex]]
@@ -153,7 +153,7 @@ nl80211_rdev_payload {
 nl80211_channel_types = NL80211_CHAN_NO_HT, NL80211_CHAN_HT20, NL80211_CHAN_HT40MINUS, NL80211_CHAN_HT40PLUS
 nl80211_channel_widths = NL80211_CHAN_WIDTH_20_NOHT, NL80211_CHAN_WIDTH_20, NL80211_CHAN_WIDTH_40, NL80211_CHAN_WIDTH_80, NL80211_CHAN_WIDTH_80P80, NL80211_CHAN_WIDTH_160, NL80211_CHAN_WIDTH_5, NL80211_CHAN_WIDTH_10
 
-nl80211_policy_chandef_params [
+nl80211_policy$chandef_params [
 	NL80211_ATTR_WIPHY_FREQ			nlattr[NL80211_ATTR_WIPHY_FREQ, ieee80211_frequency_mhz[int32]]
 	NL80211_ATTR_WIPHY_FREQ_OFFSET		nlattr[NL80211_ATTR_WIPHY_FREQ_OFFSET, int32[0:999]]
 	NL80211_ATTR_WIPHY_CHANNEL_TYPE		nlattr[NL80211_ATTR_WIPHY_CHANNEL_TYPE, flags[nl80211_channel_types, int32]]
@@ -170,7 +170,7 @@ nl80211_wdev {
 	wiphy	nl80211_wiphy
 }
 
-nl80211_policy_wiphy [
+nl80211_policy$wiphy [
 	NL80211_ATTR_WIPHY_NAME			nlattr[NL80211_ATTR_WIPHY_NAME, devname]
 	NL80211_ATTR_WIPHY_TXQ_PARAMS		nlnest[NL80211_ATTR_WIPHY_TXQ_PARAMS, array[txq_params_policy]]
 	NL80211_ATTR_WIPHY_FREQ			nlattr[NL80211_ATTR_WIPHY_FREQ, ieee80211_frequency_mhz[int32]]
@@ -189,7 +189,7 @@ nl80211_policy_wiphy [
 	NL80211_ATTR_TXQ_QUANTUM		nlattr[NL80211_ATTR_TXQ_QUANTUM, int32]
 ] [varlen]
 
-nl80211_policy_setns [
+nl80211_policy$setns [
 	NL80211_ATTR_WIPHY	nlattr[NL80211_ATTR_WIPHY, nl80211_wiphy]
 	NL80211_ATTR_IFINDEX	nlattr[NL80211_ATTR_IFINDEX, nl80211_ifindex]
 	NL80211_ATTR_WDEV	nlattr[NL80211_ATTR_WDEV, nl80211_wdev]
@@ -205,15 +205,15 @@ txq_params_policy [
 	NL80211_TXQ_ATTR_AIFS	nlattr[NL80211_TXQ_ATTR_AIFS, int8]
 ] [varlen]
 
-nl80211_policy_set_interface [
-	mon_options		array[nl80211_policy_mon_options]
+nl80211_policy$set_interface [
+	mon_options		array[nl80211_policy$mon_options]
 	NL80211_ATTR_IFTYPE	nlattr[NL80211_ATTR_IFTYPE, flags[nl80211_iftype, int32]]
 	NL80211_ATTR_MESH_ID	nlattr[NL80211_ATTR_MESH_ID, ieee80211_mesh_id]
 	NL80211_ATTR_4ADDR	nlattr[NL80211_ATTR_4ADDR, bool8]
 ] [varlen]
 
-nl80211_policy_new_interface [
-	mon_options			array[nl80211_policy_mon_options]
+nl80211_policy$new_interface [
+	mon_options			array[nl80211_policy$mon_options]
 	NL80211_ATTR_IFTYPE		nlattr[NL80211_ATTR_IFTYPE, flags[nl80211_iftype, int32]]
 	NL80211_ATTR_IFNAME		nlattr[NL80211_ATTR_IFNAME, devname]
 	NL80211_ATTR_SOCKET_OWNER	nlattr[NL80211_ATTR_SOCKET_OWNER, void]
@@ -230,7 +230,7 @@ mntr_flags_policy [
 	NL80211_MNTR_FLAG_ACTIVE	nlattr[NL80211_MNTR_FLAG_ACTIVE, void]
 ]
 
-nl80211_policy_mon_options [
+nl80211_policy$mon_options [
 	NL80211_ATTR_MNTR_FLAGS			nlnest[NL80211_ATTR_MNTR_FLAGS, array[mntr_flags_policy]]
 	NL80211_ATTR_MU_MIMO_GROUP_DATA		nlattr[NL80211_ATTR_MU_MIMO_GROUP_DATA, array[int8, VHT_MUMIMO_GROUPS_DATA_LEN]]
 	NL80211_ATTR_MU_MIMO_FOLLOW_MAC_ADDR	nlattr[NL80211_ATTR_MU_MIMO_FOLLOW_MAC_ADDR, ieee80211_mac_addr]
@@ -238,7 +238,7 @@ nl80211_policy_mon_options [
 
 nl80211_iftype = NL80211_IFTYPE_UNSPECIFIED, NL80211_IFTYPE_ADHOC, NL80211_IFTYPE_STATION, NL80211_IFTYPE_AP, NL80211_IFTYPE_AP_VLAN, NL80211_IFTYPE_WDS, NL80211_IFTYPE_MONITOR, NL80211_IFTYPE_MESH_POINT, NL80211_IFTYPE_P2P_CLIENT, NL80211_IFTYPE_P2P_GO, NL80211_IFTYPE_P2P_DEVICE, NL80211_IFTYPE_OCB, NL80211_IFTYPE_NAN
 
-nl80211_policy_cmd_key [
+nl80211_policy$cmd_key [
 	NL80211_ATTR_KEY_IDX		nlattr[NL80211_ATTR_KEY_IDX, int8[0:5]]
 	NL80211_ATTR_KEY_TYPE		nlattr[NL80211_ATTR_KEY_TYPE, flags[nl80211_key_type, int32]]
 	NL80211_ATTR_KEY_DEFAULT	nlattr[NL80211_ATTR_KEY_DEFAULT, void]
@@ -284,11 +284,11 @@ he_bss_color_policy [
 	NL80211_HE_BSS_COLOR_ATTR_PARTIAL	nlattr[NL80211_HE_BSS_COLOR_ATTR_PARTIAL, void]
 ] [varlen]
 
-nl80211_policy_start_ap [
-	beacon					array[nl80211_policy_beacon]
-	chandef_params				array[nl80211_policy_chandef_params]
-	crypto_settings				array[nl80211_policy_crypto_settings]
-	acl_policy				array[nl80211_policy_acl]
+nl80211_policy$start_ap [
+	beacon					array[nl80211_policy$beacon]
+	chandef_params				array[nl80211_policy$chandef_params]
+	crypto_settings				array[nl80211_policy$crypto_settings]
+	acl_policy				array[nl80211_policy$acl]
 	NL80211_ATTR_BEACON_INTERVAL		nlattr[NL80211_ATTR_BEACON_INTERVAL, ieee80211_beacon_interval[int32]]
 	NL80211_ATTR_DTIM_PERIOD		nlattr[NL80211_ATTR_DTIM_PERIOD, int32]
 	NL80211_ATTR_SSID			nlattr[NL80211_ATTR_SSID, ieee80211_ssid]
@@ -307,7 +307,7 @@ nl80211_policy_start_ap [
 	NL80211_ATTR_HE_BSS_COLOR		nlnest[NL80211_ATTR_HE_BSS_COLOR, array[he_bss_color_policy]]
 ] [varlen]
 
-nl80211_policy_beacon [
+nl80211_policy$beacon [
 	NL80211_ATTR_BEACON_HEAD	nlattr[NL80211_ATTR_BEACON_HEAD, ieee80211_mgmt_beacon]
 	NL80211_ATTR_BEACON_TAIL	nlattr[NL80211_ATTR_BEACON_TAIL, array[ieee80211_ie]]
 	NL80211_ATTR_IE			nlattr[NL80211_ATTR_IE, array[ieee80211_ie]]
@@ -354,7 +354,7 @@ nl80211_ftm_responder_policy [
 	NL80211_FTM_RESP_ATTR_CIVICLOC	nlattr[NL80211_FTM_RESP_ATTR_CIVICLOC, array[int8]]
 ] [varlen]
 
-nl80211_policy_station [
+nl80211_policy$station [
 	NL80211_ATTR_MAC			nlattr[NL80211_ATTR_MAC, ieee80211_mac_addr]
 	NL80211_ATTR_MGMT_SUBTYPE		nlattr[NL80211_ATTR_MGMT_SUBTYPE, flags[ieee80211_mgmt_subtype, int8]]
 	NL80211_ATTR_REASON_CODE		nlattr[NL80211_ATTR_REASON_CODE, int16]
@@ -407,12 +407,12 @@ nl80211_sta_wme_policy [
 	NL80211_STA_WME_MAX_SP		nlattr[NL80211_STA_WME_MAX_SP, int8]
 ] [varlen]
 
-nl80211_policy_mpath [
+nl80211_policy$mpath [
 	NL80211_ATTR_MAC		nlattr[NL80211_ATTR_MAC, ieee80211_mac_addr]
 	NL80211_ATTR_MPATH_NEXT_HOP	nlattr[NL80211_ATTR_MPATH_NEXT_HOP, ieee80211_mac_addr]
 ] [varlen]
 
-nl80211_policy_bss [
+nl80211_policy$bss [
 	NL80211_ATTR_BSS_CTS_PROT		nlattr[NL80211_ATTR_BSS_CTS_PROT, int8]
 	NL80211_ATTR_BSS_SHORT_PREAMBLE		nlattr[NL80211_ATTR_BSS_SHORT_PREAMBLE, int8]
 	NL80211_ATTR_BSS_SHORT_SLOT_TIME	nlattr[NL80211_ATTR_BSS_SHORT_SLOT_TIME, int8]
@@ -422,7 +422,7 @@ nl80211_policy_bss [
 	NL80211_ATTR_P2P_OPPPS			nlattr[NL80211_ATTR_P2P_OPPPS, bool8]
 ] [varlen]
 
-nl80211_policy_reg [
+nl80211_policy$reg [
 	NL80211_ATTR_WIPHY		nlattr[NL80211_ATTR_WIPHY, nl80211_wiphy]
 	NL80211_ATTR_USER_REG_HINT_TYPE	nlattr[NL80211_ATTR_USER_REG_HINT_TYPE, flags[nl80211_user_reg_hint_type, int32]]
 	NL80211_ATTR_SOCKET_OWNER	nlattr[NL80211_ATTR_SOCKET_OWNER, void]
@@ -444,15 +444,15 @@ reg_rule_policy [
 	NL80211_ATTR_DFS_CAC_TIME		nlattr[NL80211_ATTR_DFS_CAC_TIME, int32]
 ] [varlen]
 
-nl80211_policy_mesh [
+nl80211_policy$mesh [
 	NL80211_ATTR_WIPHY		nlattr[NL80211_ATTR_WIPHY, nl80211_wiphy]
 	NL80211_ATTR_IFINDEX		nlattr[NL80211_ATTR_IFINDEX, nl80211_ifindex]
 	NL80211_ATTR_WDEV		nlattr[NL80211_ATTR_WDEV, nl80211_wdev]
 	NL80211_ATTR_MESH_CONFIG	nlnest[NL80211_ATTR_MESH_CONFIG, array[nl80211_meshconf_params_policy]]
 ] [varlen]
 
-nl80211_policy_join_mesh [
-	chandef_params				array[nl80211_policy_chandef_params]
+nl80211_policy$join_mesh [
+	chandef_params				array[nl80211_policy$chandef_params]
 	NL80211_ATTR_MESH_CONFIG		nlnest[NL80211_ATTR_MESH_CONFIG, array[nl80211_meshconf_params_policy]]
 	NL80211_ATTR_MESH_SETUP			nlattr[NL80211_ATTR_MESH_SETUP, array[nl80211_mesh_setup_params_policy]]
 	NL80211_ATTR_MESH_ID			nlattr[NL80211_ATTR_MESH_ID, ieee80211_mesh_id]
@@ -513,7 +513,7 @@ nl80211_mesh_setup_params_policy [
 
 nl80211_scan_flags = NL80211_SCAN_FLAG_LOW_PRIORITY, NL80211_SCAN_FLAG_FLUSH, NL80211_SCAN_FLAG_AP, NL80211_SCAN_FLAG_RANDOM_ADDR, NL80211_SCAN_FLAG_FILS_MAX_CHANNEL_TIME, NL80211_SCAN_FLAG_ACCEPT_BCAST_PROBE_RESP, NL80211_SCAN_FLAG_OCE_PROBE_REQ_HIGH_TX_RATE, NL80211_SCAN_FLAG_OCE_PROBE_REQ_DEFERRAL_SUPPRESSION, NL80211_SCAN_FLAG_LOW_SPAN, NL80211_SCAN_FLAG_LOW_POWER, NL80211_SCAN_FLAG_HIGH_ACCURACY, NL80211_SCAN_FLAG_RANDOM_SN, NL80211_SCAN_FLAG_MIN_PREQ_CONTENT, NL80211_SCAN_FLAG_FREQ_KHZ
 
-nl80211_policy_scan [
+nl80211_policy$scan [
 	NL80211_ATTR_MAC				nlattr[NL80211_ATTR_MAC, ieee80211_mac_addr]
 	NL80211_ATTR_IE					nlattr[NL80211_ATTR_IE, array[ieee80211_ie]]
 	NL80211_ATTR_SCAN_FREQUENCIES			nlnest[NL80211_ATTR_SCAN_FREQUENCIES, array[nlattr[0, int32]]]
@@ -559,8 +559,8 @@ nl80211_match_band_rssi_policy [
 	NL80211_BAND_60GHZ	nlattr[NL80211_BAND_60GHZ, int32]
 ] [varlen]
 
-nl80211_policy_join_ibss [
-	chandef_params				array[nl80211_policy_chandef_params]
+nl80211_policy$join_ibss [
+	chandef_params				array[nl80211_policy$chandef_params]
 	NL80211_ATTR_SSID			nlattr[NL80211_ATTR_SSID, ieee80211_ssid]
 	NL80211_ATTR_HIDDEN_SSID		nlattr[NL80211_ATTR_HIDDEN_SSID, ieee80211_ssid]
 	NL80211_ATTR_BEACON_INTERVAL		nlattr[NL80211_ATTR_BEACON_INTERVAL, ieee80211_beacon_interval[int32]]
@@ -588,14 +588,14 @@ nl80211_bss_select_policy [
 	NL80211_BSS_SELECT_ATTR_RSSI_ADJUST	nlattr[NL80211_BSS_SELECT_ATTR_RSSI_ADJUST, nl80211_bss_select_rssi_adjust]
 ] [varlen]
 
-nl80211_policy_fils_params [
+nl80211_policy$fils_params [
 	NL80211_ATTR_FILS_ERP_USERNAME		nlattr[NL80211_ATTR_FILS_ERP_USERNAME, array[int8, 0:FILS_ERP_MAX_USERNAME_LEN]]
 	NL80211_ATTR_FILS_ERP_REALM		nlattr[NL80211_ATTR_FILS_ERP_REALM, array[int8]]
 	NL80211_ATTR_FILS_ERP_NEXT_SEQ_NUM	nlattr[NL80211_ATTR_FILS_ERP_NEXT_SEQ_NUM, int16]
 	NL80211_ATTR_FILS_ERP_RRK		nlattr[NL80211_ATTR_FILS_ERP_RRK, array[int8]]
 ] [varlen]
 
-nl80211_policy_crypto_settings [
+nl80211_policy$crypto_settings [
 	NL80211_ATTR_CONTROL_PORT		nlattr[NL80211_ATTR_CONTROL_PORT, void]
 	NL80211_ATTR_CONTROL_PORT_ETHERTYPE	nlattr[NL80211_ATTR_CONTROL_PORT_ETHERTYPE, flags[ether_types, int16]]
 	NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT	nlattr[NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT, void]
@@ -610,10 +610,10 @@ nl80211_policy_crypto_settings [
 	NL80211_ATTR_SAE_PASSWORD		nlattr[NL80211_ATTR_SAE_PASSWORD, array[int8, 0:SAE_PASSWORD_MAX_LEN]]
 ] [varlen]
 
-nl80211_policy_connect [
-	chandef_params				array[nl80211_policy_chandef_params]
-	fils_params				array[nl80211_policy_fils_params]
-	crypto_settings				array[nl80211_policy_crypto_settings]
+nl80211_policy$connect [
+	chandef_params				array[nl80211_policy$chandef_params]
+	fils_params				array[nl80211_policy$fils_params]
+	crypto_settings				array[nl80211_policy$crypto_settings]
 	NL80211_ATTR_WIPHY_FREQ_HINT		nlattr[NL80211_ATTR_WIPHY_FREQ_HINT, ieee80211_frequency_mhz[int32]]
 	NL80211_ATTR_SSID			nlattr[NL80211_ATTR_SSID, ieee80211_ssid]
 	NL80211_ATTR_AUTH_TYPE			nlattr[NL80211_ATTR_AUTH_TYPE, flags[nl80211_auth_type, int32]]
@@ -641,7 +641,7 @@ nl80211_policy_connect [
 	NL80211_ATTR_SOCKET_OWNER		nlattr[NL80211_ATTR_SOCKET_OWNER, void]
 ] [varlen]
 
-nl80211_policy_disconnect [
+nl80211_policy$disconnect [
 	NL80211_ATTR_REASON_CODE	nlattr[NL80211_ATTR_REASON_CODE, ieee80211_reason_code[int16]]
 ] [varlen]
 
@@ -672,7 +672,7 @@ nl80211_pmsr_req_attr_policy [
 
 nl80211_psmr_peer_attr_policy [
 	NL80211_PMSR_PEER_ATTR_ADDR	nlattr[NL80211_PMSR_PEER_ATTR_ADDR, ieee80211_mac_addr]
-	NL80211_PMSR_PEER_ATTR_CHAN	nlnest[NL80211_PMSR_PEER_ATTR_CHAN, array[nl80211_policy_chandef_params]]
+	NL80211_PMSR_PEER_ATTR_CHAN	nlnest[NL80211_PMSR_PEER_ATTR_CHAN, array[nl80211_policy$chandef_params]]
 	NL80211_PMSR_PEER_ATTR_REQ	nlnest[NL80211_PMSR_PEER_ATTR_REQ, array[nl80211_pmsr_req_attr_policy]]
 ] [varlen]
 
@@ -680,7 +680,7 @@ nl80211_pmsr_attr_policy [
 	NL80211_PMSR_ATTR_PEERS	nlnest[NL80211_PMSR_ATTR_PEERS, array[nlnest[0, array[nl80211_psmr_peer_attr_policy]]]]
 ] [varlen]
 
-nl80211_policy_upd_owe_info [
+nl80211_policy$upd_owe_info [
 	NL80211_ATTR_MAC		nlattr[NL80211_ATTR_MAC, ieee80211_mac_addr]
 	NL80211_ATTR_STATUS_CODE	nlattr[NL80211_ATTR_STATUS_CODE, ieee80211_status_code[int16]]
 	NL80211_ATTR_IE			nlattr[NL80211_ATTR_IE, array[ieee80211_ie]]
@@ -689,7 +689,7 @@ nl80211_policy_upd_owe_info [
 # TODO: consider adding a pseudo system call that receives a response and takes a cookie from there
 type nl80211_cookie int64[0:128]
 
-nl80211_policy_del_nan_func [
+nl80211_policy$del_nan_func [
 	NL80211_ATTR_COOKIE	nlattr[NL80211_ATTR_COOKIE, nl80211_cookie]
 ]
 
@@ -701,7 +701,7 @@ define NL80211_BAND_6GHZ_BIT	1 << NL80211_BAND_6GHZ
 nl80211_bands = NL80211_BAND_2GHZ_BIT, NL80211_BAND_5GHZ_BIT, NL80211_BAND_60GHZ_BIT, NL80211_BAND_6GHZ_BIT
 
 # Same for NL80211_CMD_CHANGE_NAN_CONFIG and NL80211_CMD_START_NAN
-nl80211_policy_start_nan [
+nl80211_policy$start_nan [
 	NL80211_ATTR_NAN_MASTER_PREF	nlattr[NL80211_ATTR_NAN_MASTER_PREF, int8]
 	NL80211_ATTR_BANDS		nlattr[NL80211_ATTR_BANDS, flags[nl80211_bands, int32]]
 ] [varlen]
@@ -734,11 +734,11 @@ nl80211_nan_func_policy [
 	NL80211_NAN_FUNC_TERM_REASON		nlattr[NL80211_NAN_FUNC_TERM_REASON, int8]
 ] [varlen]
 
-nl80211_policy_add_nan_func [
+nl80211_policy$add_nan_func [
 	NL80211_ATTR_NAN_FUNC	nlnest[NL80211_ATTR_NAN_FUNC, array[nl80211_nan_func_policy]]
 ] [varlen]
 
-nl80211_policy_probe_client [
+nl80211_policy$probe_client [
 	NL80211_ATTR_MAC	nlattr[NL80211_ATTR_MAC, ieee80211_mac_addr]
 ]
 
@@ -757,34 +757,34 @@ nl80211_coalesce_policy [
 
 nl80211_acl_policies = NL80211_ACL_POLICY_ACCEPT_UNLESS_LISTED, NL80211_ACL_POLICY_DENY_UNLESS_LISTED
 
-nl80211_policy_acl [
+nl80211_policy$acl [
 	NL80211_ATTR_ACL_POLICY	nlattr[NL80211_ATTR_ACL_POLICY, flags[nl80211_acl_policies, int32]]
 	NL80211_ATTR_MAC_ADDRS	nlnest[NL80211_ATTR_MAC_ADDRS, array[nlattr[NL80211_ATTR_MAC, ieee80211_mac_addr]]]
 ] [varlen]
 
-nl80211_policy_set_mcast_rate [
+nl80211_policy$set_mcast_rate [
 	NL80211_ATTR_MCAST_RATE	nlattr[NL80211_ATTR_MCAST_RATE, flags[ieee80211_raw_rates, int32]]
 ]
 
-nl80211_policy_set_mcast_to_ucast [
+nl80211_policy$set_mcast_to_ucast [
 	NL80211_ATTR_MULTICAST_TO_UNICAST_ENABLED	nlattr[NL80211_ATTR_MULTICAST_TO_UNICAST_ENABLED, void]
 ]
 
-nl80211_policy_set_noack_map [
+nl80211_policy$set_noack_map [
 	NL80211_ATTR_NOACK_MAP	nlattr[NL80211_ATTR_NOACK_MAP, int16]
 ]
 
-nl80211_policy_set_pmk [
+nl80211_policy$set_pmk [
 	NL80211_ATTR_MAC	nlattr[NL80211_ATTR_MAC, ieee80211_mac_addr]
 	NL80211_ATTR_PMK	nlattr[NL80211_ATTR_PMK, array[int8, WLAN_PMKID_LEN]]
 	NL80211_ATTR_PMKR0_NAME	nlattr[NL80211_ATTR_PMKR0_NAME, array[int8, WLAN_PMK_NAME_LEN]]
 ] [varlen]
 
-nl80211_policy_del_pmk [
+nl80211_policy$del_pmk [
 	NL80211_ATTR_MAC	nlattr[NL80211_ATTR_MAC, ieee80211_mac_addr]
 ]
 
-nl80211_policy_setdel_pmksa [
+nl80211_policy$setdel_pmksa [
 	NL80211_ATTR_MAC			nlattr[NL80211_ATTR_MAC, ieee80211_bssid]
 	NL80211_ATTR_PMK			nlattr[NL80211_ATTR_PMK, array[int8, WLAN_PMKID_LEN]]
 	NL80211_ATTR_PMKID			nlattr[NL80211_ATTR_PMKID, array[int8, WLAN_PMKID_LEN]]
@@ -794,27 +794,27 @@ nl80211_policy_setdel_pmksa [
 	NL80211_ATTR_PMK_REAUTH_THRESHOLD	nlattr[NL80211_ATTR_PMK_REAUTH_THRESHOLD, int8[1:100]]
 ] [varlen]
 
-nl80211_policy_cookie [
+nl80211_policy$cookie [
 	NL80211_ATTR_COOKIE	nlattr[NL80211_ATTR_COOKIE, nl80211_cookie]
 ]
 
 nl80211_powersave_states = NL80211_PS_DISABLED, NL80211_PS_ENABLED
 
-nl80211_policy_power_save [
+nl80211_policy$power_save [
 	NL80211_ATTR_PS_STATE	nlattr[NL80211_ATTR_PS_STATE, flags[nl80211_powersave_states, int32]]
 ]
 
-nl80211_policy_remain_on_ch [
-	chandef_params		array[nl80211_policy_chandef_params]
+nl80211_policy$remain_on_ch [
+	chandef_params		array[nl80211_policy$chandef_params]
 	NL80211_ATTR_DURATION	nlattr[NL80211_ATTR_DURATION, int32]
 ] [varlen]
 
-nl80211_policy_update_ft_ies [
+nl80211_policy$update_ft_ies [
 	NL80211_ATTR_MDID	nlattr[NL80211_ATTR_MDID, int16]
 	NL80211_ATTR_IE		nlattr[NL80211_ATTR_IE, array[ieee80211_ie]]
 ] [varlen]
 
-nl80211_policy_vendor [
+nl80211_policy$vendor [
 	NL80211_ATTR_VENDOR_ID		nlattr[NL80211_ATTR_VENDOR_ID, int32]
 	NL80211_ATTR_VENDOR_SUBCMD	nlattr[NL80211_ATTR_VENDOR_SUBCMD, int32]
 	NL80211_ATTR_VENDOR_DATA	nlattr[NL80211_ATTR_VENDOR_DATA, array[int8]]
@@ -830,7 +830,7 @@ nl80211_qos_map {
 	up		array[int8, 8]
 } [packed]
 
-nl80211_policy_set_qos_map [
+nl80211_policy$set_qos_map [
 	NL80211_ATTR_QOS_MAP	nlattr[NL80211_ATTR_QOS_MAP, nl80211_qos_map]
 ] [varlen]
 
@@ -844,12 +844,12 @@ nl80211_cqm [
 	NL80211_ATTR_CQM_RSSI_LEVEL		nlattr[NL80211_ATTR_CQM_RSSI_LEVEL, int32]
 ] [varlen]
 
-nl80211_policy_cqm [
+nl80211_policy$cqm [
 	NL80211_ATTR_CQM	nlnest[NL80211_ATTR_CQM, array[nl80211_cqm]]
 ] [varlen]
 
-nl80211_policy_mgmt_frame [
-	chandef_params			array[nl80211_policy_chandef_params]
+nl80211_policy$mgmt_frame [
+	chandef_params			array[nl80211_policy$chandef_params]
 	NL80211_ATTR_DONT_WAIT_FOR_ACK	nlattr[NL80211_ATTR_DONT_WAIT_FOR_ACK, void]
 	NL80211_ATTR_FRAME		nlattr[NL80211_ATTR_FRAME, ieee80211_mgmt_frame]
 	NL80211_ATTR_DURATION		nlattr[NL80211_ATTR_DURATION, int32[NL80211_MIN_REMAIN_ON_CHANNEL_TIME:5000]]
@@ -861,27 +861,27 @@ nl80211_policy_mgmt_frame [
 define IEEE80211_MAX_TID	IEEE80211_NUM_TIDS - 1
 define IEEE80211_MAX_UP	IEEE80211_NUM_UPS - 1
 
-nl80211_policy_add_tx_ts [
+nl80211_policy$add_tx_ts [
 	NL80211_ATTR_TSID		nlattr[NL80211_ATTR_TSID, int8[0:IEEE80211_MAX_TID]]
 	NL80211_ATTR_MAC		nlattr[NL80211_ATTR_MAC, ieee80211_mac_addr]
 	NL80211_ATTR_ADMITTED_TIME	nlattr[NL80211_ATTR_ADMITTED_TIME, int16]
 	NL80211_ATTR_USER_PRIO		nlattr[NL80211_ATTR_USER_PRIO, int8[0:IEEE80211_MAX_UP]]
 ] [varlen]
 
-nl80211_policy_del_tx_ts [
+nl80211_policy$del_tx_ts [
 	NL80211_ATTR_TSID	nlattr[NL80211_ATTR_TSID, int8[0:IEEE80211_MAX_TID]]
 	NL80211_ATTR_MAC	nlattr[NL80211_ATTR_MAC, ieee80211_mac_addr]
 ] [varlen]
 
-nl80211_policy_authenticate [
-	chandef_params		array[nl80211_policy_chandef_params]
-	key_params		array[nl80211_policy_cmd_key]
+nl80211_policy$authenticate [
+	chandef_params		array[nl80211_policy$chandef_params]
+	key_params		array[nl80211_policy$cmd_key]
 	NL80211_ATTR_MAC	nlattr[NL80211_ATTR_MAC, ieee80211_bssid]
 	NL80211_ATTR_AUTH_TYPE	nlattr[NL80211_ATTR_AUTH_TYPE, flags[nl80211_auth_type, int32]]
 	NL80211_ATTR_SSID	nlattr[NL80211_ATTR_SSID, ieee80211_ssid]
 ] [varlen]
 
-nl80211_policy_de_auth_assoc [
+nl80211_policy$de_auth_assoc [
 	NL80211_ATTR_MAC		nlattr[NL80211_ATTR_MAC, ieee80211_bssid]
 	NL80211_ATTR_SSID		nlattr[NL80211_ATTR_SSID, ieee80211_ssid]
 	NL80211_ATTR_REASON_CODE	nlattr[NL80211_ATTR_REASON_CODE, int16]
@@ -889,9 +889,9 @@ nl80211_policy_de_auth_assoc [
 	NL80211_ATTR_LOCAL_STATE_CHANGE	nlattr[NL80211_ATTR_LOCAL_STATE_CHANGE, void]
 ] [varlen]
 
-nl80211_policy_associate [
-	chandef_params				array[nl80211_policy_chandef_params]
-	crypto_settings				array[nl80211_policy_crypto_settings]
+nl80211_policy$associate [
+	chandef_params				array[nl80211_policy$chandef_params]
+	crypto_settings				array[nl80211_policy$crypto_settings]
 	NL80211_ATTR_MAC			nlattr[NL80211_ATTR_MAC, ieee80211_bssid]
 	NL80211_ATTR_SSID			nlattr[NL80211_ATTR_SSID, ieee80211_ssid]
 	NL80211_ATTR_IE				nlattr[NL80211_ATTR_IE, array[ieee80211_ie]]
@@ -908,7 +908,7 @@ nl80211_policy_associate [
 	NL80211_ATTR_FILS_NONCES		nlattr[NL80211_ATTR_FILS_NONCES, array[int16, FILS_NONCE_LEN]]
 ] [varlen]
 
-nl80211_policy_ext_auth [
+nl80211_policy$ext_auth [
 	NL80211_ATTR_BSSID		nlattr[NL80211_ATTR_BSSID, ieee80211_bssid]
 	NL80211_ATTR_SSID		nlattr[NL80211_ATTR_SSID, ieee80211_ssid]
 	NL80211_ATTR_STATUS_CODE	nlattr[NL80211_ATTR_STATUS_CODE, ieee80211_status_code[int16]]
@@ -932,11 +932,11 @@ nl80211_rekey_policy [
 	NL80211_REKEY_DATA_AKM		nlattr[NL80211_REKEY_DATA_AKM, int32]
 ] [varlen]
 
-nl80211_policy_rekey_offload [
+nl80211_policy$rekey_offload [
 	NL80211_ATTR_REKEY_DATA	nlnest[NL80211_ATTR_REKEY_DATA, array[nl80211_rekey_policy]]
 ] [varlen]
 
-nl80211_policy_set_wds_peer [
+nl80211_policy$set_wds_peer [
 	NL80211_ATTR_MAC	nlattr[NL80211_ATTR_MAC, ieee80211_bssid]
 ]
 
@@ -957,16 +957,16 @@ nl80211_tid_config_attr_policy [
 	NL80211_TID_CONFIG_ATTR_TX_RATE		nlnest[NL80211_TID_CONFIG_ATTR_TX_RATE, array[nl80211_tx_rates_policy]]
 ] [varlen]
 
-nl80211_policy_set_tid_config [
+nl80211_policy$set_tid_config [
 	NL80211_ATTR_TID_CONFIG	nlnest[NL80211_ATTR_TID_CONFIG, array[nlnest[0, array[nl80211_tid_config_attr_policy]]]]
 ] [varlen]
 
-nl80211_policy_upd_connect_params [
-	fils_params	array[nl80211_policy_fils_params]
+nl80211_policy$upd_connect_params [
+	fils_params	array[nl80211_policy$fils_params]
 	NL80211_ATTR_IE	nlattr[NL80211_ATTR_IE, array[ieee80211_ie]]
 ] [varlen]
 
-nl80211_policy_tdls_mgmt [
+nl80211_policy$tdls_mgmt [
 	NL80211_ATTR_TDLS_ACTION		nlattr[NL80211_ATTR_TDLS_ACTION, flags[ieee80211_tdls_action_codes, int8]]
 	NL80211_ATTR_MAC			nlattr[NL80211_ATTR_MAC, ieee80211_mac_addr]
 	NL80211_ATTR_STATUS_CODE		nlattr[NL80211_ATTR_STATUS_CODE, ieee80211_status_code[int16]]
@@ -978,12 +978,12 @@ nl80211_policy_tdls_mgmt [
 
 nl80211_tdls_operations = NL80211_TDLS_DISCOVERY_REQ, NL80211_TDLS_SETUP, NL80211_TDLS_TEARDOWN, NL80211_TDLS_ENABLE_LINK, NL80211_TDLS_DISABLE_LINK
 
-nl80211_policy_tdls_oper [
+nl80211_policy$tdls_oper [
 	NL80211_ATTR_TDLS_OPERATION	nlattr[NL80211_ATTR_TDLS_OPERATION, flags[nl80211_tdls_operations, int8]]
 	NL80211_ATTR_MAC		nlattr[NL80211_ATTR_MAC, ieee80211_mac_addr]
 ] [varlen]
 
-nl80211_policy_control_port [
+nl80211_policy$control_port [
 	NL80211_ATTR_FRAME			nlattr[NL80211_ATTR_FRAME, ieee80211_frame]
 	NL80211_ATTR_MAC			nlattr[NL80211_ATTR_MAC, ieee80211_mac_addr]
 	NL80211_ATTR_CONTROL_PORT_ETHERTYPE	nlattr[NL80211_ATTR_CONTROL_PORT_ETHERTYPE, flags[ether_types, int16]]
@@ -992,40 +992,40 @@ nl80211_policy_control_port [
 
 nl80211_crit_proto_ids = NL80211_CRIT_PROTO_UNSPEC, NL80211_CRIT_PROTO_DHCP, NL80211_CRIT_PROTO_EAPOL, NL80211_CRIT_PROTO_APIPA
 
-nl80211_policy_crit_proto_start [
+nl80211_policy$crit_proto_start [
 	NL80211_ATTR_CRIT_PROT_ID		nlattr[NL80211_ATTR_CRIT_PROT_ID, flags[nl80211_crit_proto_ids, int16]]
 	NL80211_ATTR_MAX_CRIT_PROT_DURATION	nlattr[NL80211_ATTR_MAX_CRIT_PROT_DURATION, int16[0:NL80211_CRIT_PROTO_MAX_DURATION]]
 ] [varlen]
 
-nl80211_policy_probe_mesh_link [
+nl80211_policy$probe_mesh_link [
 	NL80211_ATTR_FRAME	nlattr[NL80211_ATTR_FRAME, ieee80211_frame]
 	NL80211_ATTR_MAC	nlattr[NL80211_ATTR_MAC, ieee80211_mac_addr]
 ] [varlen]
 
-nl80211_policy_register_mgmt [
+nl80211_policy$register_mgmt [
 	NL80211_ATTR_FRAME_TYPE		nlattr[NL80211_ATTR_FRAME_TYPE, int16]
 	NL80211_ATTR_FRAME_MATCH	nlattr[NL80211_ATTR_FRAME_MATCH, array[int8]]
 ] [varlen]
 
-nl80211_policy_tdls_chsw [
-	chandef_params		array[nl80211_policy_chandef_params]
+nl80211_policy$tdls_chsw [
+	chandef_params		array[nl80211_policy$chandef_params]
 	NL80211_ATTR_MAC	nlattr[NL80211_ATTR_MAC, ieee80211_mac_addr]
 	NL80211_ATTR_OPER_CLASS	nlattr[NL80211_ATTR_OPER_CLASS, int8]
 ] [varlen]
 
-nl80211_policy_tdls_chsw_cancel [
+nl80211_policy$tdls_chsw_cancel [
 	NL80211_ATTR_MAC	nlattr[NL80211_ATTR_MAC, ieee80211_mac_addr]
 ] [varlen]
 
-nl80211_policy_csa [
-	beacon_params			array[nl80211_policy_beacon]
+nl80211_policy$csa [
+	beacon_params			array[nl80211_policy$beacon]
 	NL80211_ATTR_CSA_C_OFF_BEACON	nlattr[NL80211_ATTR_CSA_C_OFF_BEACON, array[int16]]
 	NL80211_ATTR_CSA_C_OFF_PRESP	nlattr[NL80211_ATTR_CSA_C_OFF_PRESP, array[int16]]
 ] [varlen]
 
-nl80211_policy_chsw [
-	chandef_params			array[nl80211_policy_chandef_params]
-	NL80211_ATTR_CSA_IES		nlnest[NL80211_ATTR_CSA_IES, array[nl80211_policy_csa]]
+nl80211_policy$chsw [
+	chandef_params			array[nl80211_policy$chandef_params]
+	NL80211_ATTR_CSA_IES		nlnest[NL80211_ATTR_CSA_IES, array[nl80211_policy$csa]]
 	NL80211_ATTR_CH_SWITCH_COUNT	nlattr[NL80211_ATTR_CH_SWITCH_COUNT, int32[0:255]]
 	NL80211_ATTR_CH_SWITCH_BLOCK_TX	nlattr[NL80211_ATTR_CH_SWITCH_BLOCK_TX, void]
 ] [varlen]
@@ -1067,17 +1067,17 @@ nl80211_wowlan_policy [
 	NL80211_WOWLAN_TRIG_RFKILL_RELEASE	nlattr[NL80211_WOWLAN_TRIG_RFKILL_RELEASE, void]
 	NL80211_WOWLAN_TRIG_PKT_PATTERN		nlnest[NL80211_WOWLAN_TRIG_PKT_PATTERN, array[nlnest[0, array[nl80211_packet_pattern_policy]]]]
 	NL80211_WOWLAN_TRIG_TCP_CONNECTION	nlnest[NL80211_WOWLAN_TRIG_TCP_CONNECTION, array[nl80211_wowlan_tcp_policy]]
-	NL80211_WOWLAN_TRIG_NET_DETECT		nlnest[NL80211_WOWLAN_TRIG_NET_DETECT, array[nl80211_policy_scan]]
+	NL80211_WOWLAN_TRIG_NET_DETECT		nlnest[NL80211_WOWLAN_TRIG_NET_DETECT, array[nl80211_policy$scan]]
 ] [varlen]
 
-nl80211_policy_set_wowlan [
+nl80211_policy$set_wowlan [
 	NL80211_ATTR_WOWLAN_TRIGGERS	nlnest[NL80211_ATTR_WOWLAN_TRIGGERS, array[nl80211_wowlan_policy]]
 ] [varlen]
 
-nl80211_policy_testmode [
+nl80211_policy$testmode [
 	NL80211_ATTR_TESTDATA	nlattr[NL80211_ATTR_TESTDATA, array[int8]]
 ] [varlen]
 
-nl80211_policy_set_tx_bitrate [
+nl80211_policy$set_tx_bitrate [
 	NL80211_ATTR_TX_RATES	nlnest[NL80211_ATTR_TX_RATES, array[nl80211_tx_rates_policy]]
 ] [varlen]
diff --git a/sys/linux/socket_netlink_generic_devlink.txt b/sys/linux/socket_netlink_generic_devlink.txt
index 91c0d69df..4e8ceeb4b 100644
--- a/sys/linux/socket_netlink_generic_devlink.txt
+++ b/sys/linux/socket_netlink_generic_devlink.txt
@@ -46,20 +46,20 @@ devlink_devname {
 	z	const[0, int8]
 } [packed]
 
-devlink_nl_policy_nsim {
+devlink_nl_policy$nsim {
 	DEVLINK_ATTR_BUS_NAME	nlattr[DEVLINK_ATTR_BUS_NAME, string["netdevsim"]]
 	DEVLINK_ATTR_DEV_NAME	nlattr[DEVLINK_ATTR_DEV_NAME, devlink_devname]
 } [packed, align[4]]
 
-devlink_nl_policy_pci {
+devlink_nl_policy$pci {
 	DEVLINK_ATTR_BUS_NAME	nlattr[DEVLINK_ATTR_BUS_NAME, string["pci"]]
 # 0000:00:10.0 is a fixed pci address what is moved from initial network namespace by initialize_devlink()
 	DEVLINK_ATTR_DEV_NAME	nlattr[DEVLINK_ATTR_DEV_NAME, string["0000:00:10.0"]]
 } [packed, align[4]]
 
 devlink_handle [
-	nsim	devlink_nl_policy_nsim
-	pci	devlink_nl_policy_pci
+	nsim	devlink_nl_policy$nsim
+	pci	devlink_nl_policy$pci
 ] [varlen]
 
 devlink_port_handle {
@@ -68,7 +68,7 @@ devlink_port_handle {
 	DEVLINK_ATTR_PORT_INDEX	nlattr[DEVLINK_ATTR_PORT_INDEX, int32[0:3]]
 } [packed, align[4]]
 
-devlink_nl_policy_reload [
+devlink_nl_policy$reload [
 	DEVLINK_ATTR_NETNS_PID	nlattr[DEVLINK_ATTR_NETNS_PID, pid]
 	DEVLINK_ATTR_NETNS_FD	nlattr[DEVLINK_ATTR_NETNS_FD, fd_namespace]
 	DEVLINK_ATTR_NETNS_ID	nlattr[DEVLINK_ATTR_NETNS_ID, netns_id]
@@ -76,7 +76,7 @@ devlink_nl_policy_reload [
 
 devlink_reload_policy {
 	handle	devlink_handle
-	arg	devlink_nl_policy_reload
+	arg	devlink_nl_policy$reload
 } [packed, align[4]]
 
 devlink_port_get_policy {
diff --git a/sys/linux/socket_netlink_generic_gtp.txt b/sys/linux/socket_netlink_generic_gtp.txt
index 287065d87..3f085e4e9 100644
--- a/sys/linux/socket_netlink_generic_gtp.txt
+++ b/sys/linux/socket_netlink_generic_gtp.txt
@@ -36,10 +36,10 @@ gtp_genl_policy [
 gtp_policy {
 	IFLA_GTP_FD0	nlattr[IFLA_GTP_FD0, sock_udp]
 	IFLA_GTP_FD1	nlattr[IFLA_GTP_FD1, sock_udp]
-	var		array[gtp_policy_var]
+	var		array[gtp_policy$var]
 }
 
-gtp_policy_var [
+gtp_policy$var [
 	IFLA_GTP_FD0		nlattr[IFLA_GTP_FD0, sock_udp6]
 	IFLA_GTP_FD1		nlattr[IFLA_GTP_FD1, sock_udp6]
 	IFLA_GTP_PDP_HASHSIZE	nlattr[IFLA_GTP_PDP_HASHSIZE, int32]
diff --git a/sys/linux/socket_netlink_generic_netlabel.txt b/sys/linux/socket_netlink_generic_netlabel.txt
index 1de6843ab..43307134f 100644
--- a/sys/linux/socket_netlink_generic_netlabel.txt
+++ b/sys/linux/socket_netlink_generic_netlabel.txt
@@ -85,16 +85,16 @@ netlbl_cipsov4_genl_policy [
 	NLBL_CIPSOV4_A_DOI		nlattr[NLBL_CIPSOV4_A_DOI, flags[cipso_doi, int32]]
 	NLBL_CIPSOV4_A_MTYPE		nlattr[NLBL_CIPSOV4_A_MTYPE, flags[cipsov4_type, int32]]
 	NLBL_CIPSOV4_A_TAGLST		nlnest[NLBL_CIPSOV4_A_TAGLST, array[nlattr[NLBL_CIPSOV4_A_TAG, flags[cipsov4_tags, int8]]]]
-	NLBL_CIPSOV4_A_MLSLVLLST	nlnest[NLBL_CIPSOV4_A_MLSLVLLST, array[nlnest[NLBL_CIPSOV4_A_MLSLVL, array[netlbl_cipsov4_genl_policy_mlslvl]]]]
-	NLBL_CIPSOV4_A_MLSCATLST	nlnest[NLBL_CIPSOV4_A_MLSCATLST, array[nlnest[NLBL_CIPSOV4_A_MLSCAT, array[netlbl_cipsov4_genl_policy_mlscat]]]]
+	NLBL_CIPSOV4_A_MLSLVLLST	nlnest[NLBL_CIPSOV4_A_MLSLVLLST, array[nlnest[NLBL_CIPSOV4_A_MLSLVL, array[netlbl_cipsov4_genl_policy$mlslvl]]]]
+	NLBL_CIPSOV4_A_MLSCATLST	nlnest[NLBL_CIPSOV4_A_MLSCATLST, array[nlnest[NLBL_CIPSOV4_A_MLSCAT, array[netlbl_cipsov4_genl_policy$mlscat]]]]
 ] [varlen]
 
-netlbl_cipsov4_genl_policy_mlslvl [
+netlbl_cipsov4_genl_policy$mlslvl [
 	NLBL_CIPSOV4_A_MLSLVLLOC	nlattr[NLBL_CIPSOV4_A_MLSLVLLOC, int32[0:CIPSO_V4_MAX_LOC_LVLS]]
 	NLBL_CIPSOV4_A_MLSLVLREM	nlattr[NLBL_CIPSOV4_A_MLSLVLREM, int32[0:CIPSO_V4_MAX_REM_LVLS]]
 ] [varlen]
 
-netlbl_cipsov4_genl_policy_mlscat [
+netlbl_cipsov4_genl_policy$mlscat [
 	NLBL_CIPSOV4_A_MLSCATLOC	nlattr[NLBL_CIPSOV4_A_MLSCATLOC, int32[0:CIPSO_V4_MAX_LOC_CATS]]
 	NLBL_CIPSOV4_A_MLSCATREM	nlattr[NLBL_CIPSOV4_A_MLSCATREM, int32[0:CIPSO_V4_MAX_REM_CATS]]
 ] [varlen]
diff --git a/sys/linux/socket_netlink_generic_team.txt b/sys/linux/socket_netlink_generic_team.txt
index 6c4f77341..5870dd217 100644
--- a/sys/linux/socket_netlink_generic_team.txt
+++ b/sys/linux/socket_netlink_generic_team.txt
@@ -32,12 +32,12 @@ type team_nl_option_policy[NAME, TYPE, DATA] {
 	TEAM_ATTR_OPTION_DATA	nlattr[TEAM_ATTR_OPTION_DATA, DATA]
 } [packed, align[4]]
 
-type team_nl_option_policy_per_port[NAME, TYPE, DATA] {
+type team_nl_option_policy$per_port[NAME, TYPE, DATA] {
 	opt				team_nl_option_policy[NAME, TYPE, DATA]
 	TEAM_ATTR_OPTION_PORT_IFINDEX	nlattr[TEAM_ATTR_OPTION_PORT_IFINDEX, ifindex]
 } [packed, align[4]]
 
-type team_nl_option_policy_array[NAME, TYPE, DATA, SIZE] {
+type team_nl_option_policy$array[NAME, TYPE, DATA, SIZE] {
 	opt				team_nl_option_policy[NAME, TYPE, DATA]
 	TEAM_ATTR_OPTION_ARRAY_INDEX	nlattr[TEAM_ATTR_OPTION_ARRAY_INDEX, int32[0:SIZE]]
 } [packed, align[4]]
@@ -49,17 +49,17 @@ team_attr_option [
 	mcast_rejoin_count		team_nl_option_policy["mcast_rejoin_count", NLA_U32, int32]
 	mcast_rejoin_interval		team_nl_option_policy["mcast_rejoin_interval", NLA_U32, int32]
 # TODO: NLA_FLAG value is determined by presence of TEAM_ATTR_OPTION_DATA attr, but we always pass it.
-	enabled				team_nl_option_policy_per_port["enabled", NLA_FLAG, void]
-	user_linkup			team_nl_option_policy_per_port["user_linkup", NLA_FLAG, void]
-	user_linkup_enabled		team_nl_option_policy_per_port["user_linkup_enabled", NLA_FLAG, void]
-	priority			team_nl_option_policy_per_port["priority", NLA_S32, int32]
-	queue_id			team_nl_option_policy_per_port["queue_id", NLA_U32, int32]
+	enabled				team_nl_option_policy$per_port["enabled", NLA_FLAG, void]
+	user_linkup			team_nl_option_policy$per_port["user_linkup", NLA_FLAG, void]
+	user_linkup_enabled		team_nl_option_policy$per_port["user_linkup_enabled", NLA_FLAG, void]
+	priority			team_nl_option_policy$per_port["priority", NLA_S32, int32]
+	queue_id			team_nl_option_policy$per_port["queue_id", NLA_U32, int32]
 	activeport			team_nl_option_policy["activeport", NLA_U32, ifindex]
 	bpf_hash_func			team_nl_option_policy["bpf_hash_func", NLA_BINARY, array[sock_filter]]
 	lb_tx_method			team_nl_option_policy["lb_tx_method", NLA_STRING, string[team_attr_option_lb_tx_method]]
-	lb_tx_hash_to_port_mapping	team_nl_option_policy_array["lb_tx_hash_to_port_mapping", NLA_U32, ifindex, 256]
-	lb_hash_stats			team_nl_option_policy_array["lb_hash_stats", NLA_BINARY, int32, 256]
-	lb_port_stats			team_nl_option_policy_per_port["lb_port_stats", NLA_BINARY, int32]
+	lb_tx_hash_to_port_mapping	team_nl_option_policy$array["lb_tx_hash_to_port_mapping", NLA_U32, ifindex, 256]
+	lb_hash_stats			team_nl_option_policy$array["lb_hash_stats", NLA_BINARY, int32, 256]
+	lb_port_stats			team_nl_option_policy$per_port["lb_port_stats", NLA_BINARY, int32]
 	lb_stats_refresh_interval	team_nl_option_policy["lb_stats_refresh_interval", NLA_U32, int32]
 ] [varlen]
 
diff --git a/sys/linux/socket_netlink_generic_wireguard.txt b/sys/linux/socket_netlink_generic_wireguard.txt
index 6de53d1d5..8a904ba11 100644
--- a/sys/linux/socket_netlink_generic_wireguard.txt
+++ b/sys/linux/socket_netlink_generic_wireguard.txt
@@ -46,17 +46,17 @@ peer_policy [
 ] [varlen]
 
 allowedip_policy [
-	ipv4	allowedip_policy_ipv4
-	ipv6	allowedip_policy_ipv6
+	ipv4	allowedip_policy$ipv4
+	ipv6	allowedip_policy$ipv6
 ] [varlen]
 
-allowedip_policy_ipv4 {
+allowedip_policy$ipv4 {
 	WGALLOWEDIP_A_FAMILY	nlattr[WGALLOWEDIP_A_FAMILY, const[AF_INET, int16]]
 	WGALLOWEDIP_A_IPADDR	nlattr[WGALLOWEDIP_A_IPADDR, ipv4_addr]
 	WGALLOWEDIP_A_CIDR_MASK	nlattr[WGALLOWEDIP_A_CIDR_MASK, int8[0:3]]
 } [packed]
 
-allowedip_policy_ipv6 {
+allowedip_policy$ipv6 {
 	WGALLOWEDIP_A_FAMILY	nlattr[WGALLOWEDIP_A_FAMILY, const[AF_INET6, int16]]
 	WGALLOWEDIP_A_IPADDR	nlattr[WGALLOWEDIP_A_IPADDR, ipv6_addr]
 	WGALLOWEDIP_A_CIDR_MASK	nlattr[WGALLOWEDIP_A_CIDR_MASK, int8[0:3]]
diff --git a/sys/linux/socket_netlink_netfilter_acct.txt b/sys/linux/socket_netlink_netfilter_acct.txt
index ef489f9a8..1426b73ea 100644
--- a/sys/linux/socket_netlink_netfilter_acct.txt
+++ b/sys/linux/socket_netlink_netfilter_acct.txt
@@ -21,10 +21,10 @@ nfnl_acct_policy [
 	NFACCT_PKTS	nlnetw[NFACCT_PKTS, int64be]
 	NFACCT_FLAGS	nlnetw[NFACCT_FLAGS, flags[nfnl_acct_flags, int32be]]
 	NFACCT_QUOTA	nlnetw[NFACCT_QUOTA, int64be]
-	NFACCT_FILTER	nlnest[NFACCT_FILTER, array[filter_policy_acct]]
+	NFACCT_FILTER	nlnest[NFACCT_FILTER, array[filter_policy$acct]]
 ] [varlen]
 
-filter_policy_acct [
+filter_policy$acct [
 	NFACCT_FILTER_MASK	nlnetw[NFACCT_FILTER_MASK, int32be]
 	NFACCT_FILTER_VALUE	nlnetw[NFACCT_FILTER_VALUE, int32be]
 ] [varlen]
diff --git a/sys/linux/socket_netlink_netfilter_conntrack.txt b/sys/linux/socket_netlink_netfilter_conntrack.txt
index 4db2300bc..74c98d4f6 100644
--- a/sys/linux/socket_netlink_netfilter_conntrack.txt
+++ b/sys/linux/socket_netlink_netfilter_conntrack.txt
@@ -58,16 +58,16 @@ tuple_nla_policy [
 ] [varlen]
 
 cta_ip_nla_policy [
-	ipv4	cta_ip_nla_policy_ipv4
-	ipv6	cta_ip_nla_policy_ipv6
+	ipv4	cta_ip_nla_policy$ipv4
+	ipv6	cta_ip_nla_policy$ipv6
 ] [varlen]
 
-cta_ip_nla_policy_ipv4 {
+cta_ip_nla_policy$ipv4 {
 	CTA_IP_V4_SRC	nlattr[CTA_IP_V4_SRC, ipv4_addr]
 	CTA_IP_V4_DST	nlattr[CTA_IP_V4_DST, ipv4_addr]
 }
 
-cta_ip_nla_policy_ipv6 {
+cta_ip_nla_policy$ipv6 {
 	CTA_IP_V6_SRC	nlattr[CTA_IP_V6_SRC, ipv6_addr]
 	CTA_IP_V6_DST	nlattr[CTA_IP_V6_DST, ipv6_addr]
 }
diff --git a/sys/linux/socket_netlink_netfilter_nftables.txt b/sys/linux/socket_netlink_netfilter_nftables.txt
index dc47246b0..facb8bb4c 100644
--- a/sys/linux/socket_netlink_netfilter_nftables.txt
+++ b/sys/linux/socket_netlink_netfilter_nftables.txt
@@ -62,7 +62,7 @@ nft_batch_message [
 	NFT_MSG_DELSET		netlink_msg_netfilter_t[NFNL_SUBSYS_NFTABLES, NFT_MSG_DELSET, nft_set_policy]
 	NFT_MSG_NEWSETELEM	netlink_msg_netfilter_t[NFNL_SUBSYS_NFTABLES, NFT_MSG_NEWSETELEM, nft_set_elem_list_policy]
 	NFT_MSG_DELSETELEM	netlink_msg_netfilter_t[NFNL_SUBSYS_NFTABLES, NFT_MSG_DELSETELEM, nft_set_elem_list_policy]
-	NFT_MSG_NEWOBJ		netlink_msg_netfilter_tt[NFNL_SUBSYS_NFTABLES, NFT_MSG_NEWOBJ, nft_obj_policy_new]
+	NFT_MSG_NEWOBJ		netlink_msg_netfilter_tt[NFNL_SUBSYS_NFTABLES, NFT_MSG_NEWOBJ, nft_obj_policy$new]
 	NFT_MSG_DELOBJ		netlink_msg_netfilter_t[NFNL_SUBSYS_NFTABLES, NFT_MSG_DELOBJ, nft_obj_policy]
 	NFT_MSG_NEWFLOWTABLE	netlink_msg_netfilter_t[NFNL_SUBSYS_NFTABLES, NFT_MSG_NEWFLOWTABLE, nft_flowtable_policy]
 	NFT_MSG_DELFLOWTABLE	netlink_msg_netfilter_t[NFNL_SUBSYS_NFTABLES, NFT_MSG_DELFLOWTABLE, nft_flowtable_policy]
@@ -212,7 +212,7 @@ nft_obj_policy [
 	NFTA_OBJ_HANDLE	nlnetw[NFTA_OBJ_HANDLE, nft_handle]
 ] [varlen]
 
-type nft_obj_policy_new_t[TYPE, POLICY] [
+type nft_obj_policy$new_t[TYPE, POLICY] [
 	NFTA_OBJ_TABLE	nlattr[NFTA_OBJ_TABLE, string[nft_table_name]]
 	NFTA_OBJ_NAME	nlattr[NFTA_OBJ_NAME, string[nft_obj_name]]
 	NFTA_OBJ_TYPE	nlnetw[NFTA_OBJ_TYPE, const[TYPE, int32be]]
@@ -220,17 +220,17 @@ type nft_obj_policy_new_t[TYPE, POLICY] [
 	NFTA_OBJ_HANDLE	nlnetw[NFTA_OBJ_HANDLE, nft_handle]
 ] [varlen]
 
-nft_obj_policy_new [
-	NFT_OBJECT_SECMARK	nft_obj_policy_new_t[NFT_OBJECT_SECMARK, nft_secmark_policy]
-	NFT_OBJECT_CONNLIMIT	nft_obj_policy_new_t[NFT_OBJECT_CONNLIMIT, nft_connlimit_policy]
-	NFT_OBJECT_COUNTER	nft_obj_policy_new_t[NFT_OBJECT_COUNTER, nft_counter_policy]
-	NFT_OBJECT_CT_TIMEOUT	nft_obj_policy_new_t[NFT_OBJECT_CT_TIMEOUT, nft_ct_timeout_policy]
-	NFT_OBJECT_CT_HELPER	nft_obj_policy_new_t[NFT_OBJECT_CT_HELPER, nft_ct_helper_policy]
-	NFT_OBJECT_CT_EXPECT	nft_obj_policy_new_t[NFT_OBJECT_CT_EXPECT, nft_ct_expect_policy]
-	NFT_OBJECT_LIMIT	nft_obj_policy_new_t[NFT_OBJECT_LIMIT, nft_limit_policy]
-	NFT_OBJECT_QUOTA	nft_obj_policy_new_t[NFT_OBJECT_QUOTA, nft_quota_policy]
-	NFT_OBJECT_SYNPROXY	nft_obj_policy_new_t[NFT_OBJECT_SYNPROXY, nft_synproxy_policy]
-	NFT_OBJECT_TUNNEL	nft_obj_policy_new_t[NFT_OBJECT_TUNNEL, nft_tunnel_key_policy]
+nft_obj_policy$new [
+	NFT_OBJECT_SECMARK	nft_obj_policy$new_t[NFT_OBJECT_SECMARK, nft_secmark_policy]
+	NFT_OBJECT_CONNLIMIT	nft_obj_policy$new_t[NFT_OBJECT_CONNLIMIT, nft_connlimit_policy]
+	NFT_OBJECT_COUNTER	nft_obj_policy$new_t[NFT_OBJECT_COUNTER, nft_counter_policy]
+	NFT_OBJECT_CT_TIMEOUT	nft_obj_policy$new_t[NFT_OBJECT_CT_TIMEOUT, nft_ct_timeout_policy]
+	NFT_OBJECT_CT_HELPER	nft_obj_policy$new_t[NFT_OBJECT_CT_HELPER, nft_ct_helper_policy]
+	NFT_OBJECT_CT_EXPECT	nft_obj_policy$new_t[NFT_OBJECT_CT_EXPECT, nft_ct_expect_policy]
+	NFT_OBJECT_LIMIT	nft_obj_policy$new_t[NFT_OBJECT_LIMIT, nft_limit_policy]
+	NFT_OBJECT_QUOTA	nft_obj_policy$new_t[NFT_OBJECT_QUOTA, nft_quota_policy]
+	NFT_OBJECT_SYNPROXY	nft_obj_policy$new_t[NFT_OBJECT_SYNPROXY, nft_synproxy_policy]
+	NFT_OBJECT_TUNNEL	nft_obj_policy$new_t[NFT_OBJECT_TUNNEL, nft_tunnel_key_policy]
 ] [varlen]
 
 nft_obj_name = "syz0", "syz1", "syz2"
diff --git a/sys/linux/socket_netlink_rdma.txt b/sys/linux/socket_netlink_rdma.txt
index a767157fc..8cf1c9cde 100644
--- a/sys/linux/socket_netlink_rdma.txt
+++ b/sys/linux/socket_netlink_rdma.txt
@@ -13,23 +13,23 @@ syz_init_net_socket$nl_rdma(domain const[AF_NETLINK], type const[SOCK_RAW], prot
 
 type msg_nl_rdma[CMD, POLICY] ptr[in, msghdr_netlink[netlink_msg[CMD, void, POLICY]]]
 
-sendmsg$RDMA_NLDEV_CMD_GET(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_GET, nldev_policy_DEV], f flags[send_flags])
-sendmsg$RDMA_NLDEV_CMD_SET(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_SET, nldev_policy_SET], f flags[send_flags])
-sendmsg$RDMA_NLDEV_CMD_NEWLINK(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_NEWLINK, nldev_policy_NEWLINK], f flags[send_flags])
-sendmsg$RDMA_NLDEV_CMD_DELLINK(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_DELLINK, nldev_policy_DEV], f flags[send_flags])
-sendmsg$RDMA_NLDEV_CMD_PORT_GET(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_PORT_GET, nldev_policy_PORT_GET], f flags[send_flags])
-sendmsg$RDMA_NLDEV_CMD_SYS_GET(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_SYS_GET, nldev_policy_DEV], f flags[send_flags])
-sendmsg$RDMA_NLDEV_CMD_SYS_SET(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_SYS_SET, nldev_policy_SET], f flags[send_flags])
-sendmsg$RDMA_NLDEV_CMD_RES_GET(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_RES_GET, nldev_policy_DEV], f flags[send_flags])
-sendmsg$RDMA_NLDEV_CMD_RES_QP_GET(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_RES_QP_GET, nldev_policy_RES_QP_GET], f flags[send_flags])
-sendmsg$RDMA_NLDEV_CMD_RES_CM_ID_GET(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_RES_CM_ID_GET, nldev_policy_RES_CM_ID_GET], f flags[send_flags])
-sendmsg$RDMA_NLDEV_CMD_RES_CQ_GET(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_RES_CQ_GET, nldev_policy_RES_CQ_GET], f flags[send_flags])
-sendmsg$RDMA_NLDEV_CMD_RES_MR_GET(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_RES_MR_GET, nldev_policy_RES_MR_GET], f flags[send_flags])
-sendmsg$RDMA_NLDEV_CMD_RES_PD_GET(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_RES_PD_GET, nldev_policy_RES_PD_GET], f flags[send_flags])
-sendmsg$RDMA_NLDEV_CMD_GET_CHARDEV(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_GET_CHARDEV, nldev_policy_GET_CHARDEV], f flags[send_flags])
-sendmsg$RDMA_NLDEV_CMD_STAT_SET(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_STAT_SET, nldev_policy_STAT_SET], f flags[send_flags])
-sendmsg$RDMA_NLDEV_CMD_STAT_GET(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_STAT_GET, nldev_policy_STAT_GET], f flags[send_flags])
-sendmsg$RDMA_NLDEV_CMD_STAT_DEL(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_STAT_DEL, nldev_policy_STAT_DEL], f flags[send_flags])
+sendmsg$RDMA_NLDEV_CMD_GET(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_GET, nldev_policy$DEV], f flags[send_flags])
+sendmsg$RDMA_NLDEV_CMD_SET(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_SET, nldev_policy$SET], f flags[send_flags])
+sendmsg$RDMA_NLDEV_CMD_NEWLINK(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_NEWLINK, nldev_policy$NEWLINK], f flags[send_flags])
+sendmsg$RDMA_NLDEV_CMD_DELLINK(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_DELLINK, nldev_policy$DEV], f flags[send_flags])
+sendmsg$RDMA_NLDEV_CMD_PORT_GET(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_PORT_GET, nldev_policy$PORT_GET], f flags[send_flags])
+sendmsg$RDMA_NLDEV_CMD_SYS_GET(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_SYS_GET, nldev_policy$DEV], f flags[send_flags])
+sendmsg$RDMA_NLDEV_CMD_SYS_SET(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_SYS_SET, nldev_policy$SET], f flags[send_flags])
+sendmsg$RDMA_NLDEV_CMD_RES_GET(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_RES_GET, nldev_policy$DEV], f flags[send_flags])
+sendmsg$RDMA_NLDEV_CMD_RES_QP_GET(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_RES_QP_GET, nldev_policy$RES_QP_GET], f flags[send_flags])
+sendmsg$RDMA_NLDEV_CMD_RES_CM_ID_GET(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_RES_CM_ID_GET, nldev_policy$RES_CM_ID_GET], f flags[send_flags])
+sendmsg$RDMA_NLDEV_CMD_RES_CQ_GET(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_RES_CQ_GET, nldev_policy$RES_CQ_GET], f flags[send_flags])
+sendmsg$RDMA_NLDEV_CMD_RES_MR_GET(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_RES_MR_GET, nldev_policy$RES_MR_GET], f flags[send_flags])
+sendmsg$RDMA_NLDEV_CMD_RES_PD_GET(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_RES_PD_GET, nldev_policy$RES_PD_GET], f flags[send_flags])
+sendmsg$RDMA_NLDEV_CMD_GET_CHARDEV(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_GET_CHARDEV, nldev_policy$GET_CHARDEV], f flags[send_flags])
+sendmsg$RDMA_NLDEV_CMD_STAT_SET(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_STAT_SET, nldev_policy$STAT_SET], f flags[send_flags])
+sendmsg$RDMA_NLDEV_CMD_STAT_GET(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_STAT_GET, nldev_policy$STAT_GET], f flags[send_flags])
+sendmsg$RDMA_NLDEV_CMD_STAT_DEL(fd sock_nl_rdma, msg msg_nl_rdma[RDMA_NLDEV_STAT_DEL, nldev_policy$STAT_DEL], f flags[send_flags])
 
 define RDMA_NLDEV_GET	RDMA_NL_GET_TYPE(RDMA_NL_NLDEV, RDMA_NLDEV_CMD_GET)
 define RDMA_NLDEV_SET	RDMA_NL_GET_TYPE(RDMA_NL_NLDEV, RDMA_NLDEV_CMD_SET)
@@ -52,59 +52,59 @@ define RDMA_NLDEV_STAT_DEL	RDMA_NL_GET_TYPE(RDMA_NL_NLDEV, RDMA_NLDEV_CMD_STAT_D
 nldev_name = "syz0", "syz1", "syz2"
 nldev_type = "siw", "rxe"
 
-nldev_policy_DEV [
+nldev_policy$DEV [
 	RDMA_NLDEV_ATTR_DEV_INDEX	nlattr[RDMA_NLDEV_ATTR_DEV_INDEX, int32[0:2]]
 ] [varlen]
 
-nldev_policy_SET [
+nldev_policy$SET [
 	RDMA_NLDEV_ATTR_DEV_INDEX	nlattr[RDMA_NLDEV_ATTR_DEV_INDEX, int32[0:2]]
 	RDMA_NLDEV_ATTR_DEV_NAME	nlattr[RDMA_NLDEV_ATTR_DEV_NAME, string[nldev_name]]
 	RDMA_NLDEV_NET_NS_FD		nlattr[RDMA_NLDEV_NET_NS_FD, fd_namespace]
 	RDMA_NLDEV_ATTR_DEV_DIM		nlattr[RDMA_NLDEV_ATTR_DEV_DIM, bool8]
 ] [varlen]
 
-nldev_policy_NEWLINK {
+nldev_policy$NEWLINK {
 	RDMA_NLDEV_ATTR_DEV_NAME	nlattr[RDMA_NLDEV_ATTR_DEV_NAME, string[nldev_name]]
 	RDMA_NLDEV_ATTR_LINK_TYPE	nlattr[RDMA_NLDEV_ATTR_LINK_TYPE, string[nldev_type]]
 	RDMA_NLDEV_ATTR_NDEV_NAME	nlattr[RDMA_NLDEV_ATTR_NDEV_NAME, devname]
 } [packed]
 
-nldev_policy_PORT_GET {
+nldev_policy$PORT_GET {
 	RDMA_NLDEV_ATTR_DEV_INDEX	nlattr[RDMA_NLDEV_ATTR_DEV_INDEX, int32[0:2]]
 	RDMA_NLDEV_ATTR_PORT_INDEX	nlattr[RDMA_NLDEV_ATTR_PORT_INDEX, int32[0:4]]
 } [packed]
 
-nldev_policy_RES_QP_GET [
+nldev_policy$RES_QP_GET [
 	RDMA_NLDEV_ATTR_DEV_INDEX	nlattr[RDMA_NLDEV_ATTR_DEV_INDEX, int32[0:2]]
 	RDMA_NLDEV_ATTR_PORT_INDEX	nlattr[RDMA_NLDEV_ATTR_PORT_INDEX, int32[0:4]]
 	RDMA_NLDEV_ATTR_RES_LQPN	nlattr[RDMA_NLDEV_ATTR_RES_LQPN, int32[0:5]]
 ] [varlen]
 
-nldev_policy_RES_CM_ID_GET [
+nldev_policy$RES_CM_ID_GET [
 	RDMA_NLDEV_ATTR_DEV_INDEX	nlattr[RDMA_NLDEV_ATTR_DEV_INDEX, int32[0:2]]
 	RDMA_NLDEV_ATTR_PORT_INDEX	nlattr[RDMA_NLDEV_ATTR_PORT_INDEX, int32[0:4]]
 	RDMA_NLDEV_ATTR_RES_CM_IDN	nlattr[RDMA_NLDEV_ATTR_RES_CM_IDN, int32[0:5]]
 ] [varlen]
 
-nldev_policy_RES_CQ_GET [
+nldev_policy$RES_CQ_GET [
 	RDMA_NLDEV_ATTR_DEV_INDEX	nlattr[RDMA_NLDEV_ATTR_DEV_INDEX, int32[0:2]]
 	RDMA_NLDEV_ATTR_PORT_INDEX	nlattr[RDMA_NLDEV_ATTR_PORT_INDEX, int32[0:4]]
 	RDMA_NLDEV_ATTR_RES_CQN		nlattr[RDMA_NLDEV_ATTR_RES_CQN, int32[0:5]]
 ] [varlen]
 
-nldev_policy_RES_MR_GET [
+nldev_policy$RES_MR_GET [
 	RDMA_NLDEV_ATTR_DEV_INDEX	nlattr[RDMA_NLDEV_ATTR_DEV_INDEX, int32[0:2]]
 	RDMA_NLDEV_ATTR_PORT_INDEX	nlattr[RDMA_NLDEV_ATTR_PORT_INDEX, int32[0:4]]
 	RDMA_NLDEV_ATTR_RES_MRN		nlattr[RDMA_NLDEV_ATTR_RES_MRN, int32[0:5]]
 ] [varlen]
 
-nldev_policy_RES_PD_GET [
+nldev_policy$RES_PD_GET [
 	RDMA_NLDEV_ATTR_DEV_INDEX	nlattr[RDMA_NLDEV_ATTR_DEV_INDEX, int32[0:2]]
 	RDMA_NLDEV_ATTR_PORT_INDEX	nlattr[RDMA_NLDEV_ATTR_PORT_INDEX, int32[0:4]]
 	RDMA_NLDEV_ATTR_RES_PDN		nlattr[RDMA_NLDEV_ATTR_RES_PDN, int32[0:5]]
 ] [varlen]
 
-nldev_policy_GET_CHARDEV [
+nldev_policy$GET_CHARDEV [
 	RDMA_NLDEV_ATTR_DEV_INDEX	nlattr[RDMA_NLDEV_ATTR_DEV_INDEX, int32[0:2]]
 	RDMA_NLDEV_ATTR_PORT_INDEX	nlattr[RDMA_NLDEV_ATTR_PORT_INDEX, int32[0:4]]
 	RDMA_NLDEV_ATTR_CHARDEV_TYPE	nlattr[RDMA_NLDEV_ATTR_CHARDEV_TYPE, string[nldev_chardev_type]]
@@ -112,7 +112,7 @@ nldev_policy_GET_CHARDEV [
 
 nldev_chardev_type = "ib_multicast", "sa", "umad", "issm", "rdma_cm", "cma", "mad", "uverbs", "cm", "ib_srpt", "ipoib", "opa_vnic", "srp", "smc_ib"
 
-nldev_policy_STAT_SET [
+nldev_policy$STAT_SET [
 	RDMA_NLDEV_ATTR_DEV_INDEX		nlattr[RDMA_NLDEV_ATTR_DEV_INDEX, int32[0:2]]
 	RDMA_NLDEV_ATTR_PORT_INDEX		nlattr[RDMA_NLDEV_ATTR_PORT_INDEX, int32[0:4]]
 	RDMA_NLDEV_ATTR_STAT_RES		nlattr[RDMA_NLDEV_ATTR_STAT_RES, const[RDMA_NLDEV_ATTR_RES_QP, int32]]
@@ -124,7 +124,7 @@ nldev_policy_STAT_SET [
 
 rdma_nl_counter_mode = RDMA_COUNTER_MODE_NONE, RDMA_COUNTER_MODE_AUTO, RDMA_COUNTER_MODE_MANUAL
 
-nldev_policy_STAT_GET [
+nldev_policy$STAT_GET [
 	RDMA_NLDEV_ATTR_DEV_INDEX	nlattr[RDMA_NLDEV_ATTR_DEV_INDEX, int32[0:2]]
 	RDMA_NLDEV_ATTR_PORT_INDEX	nlattr[RDMA_NLDEV_ATTR_PORT_INDEX, int32[0:4]]
 	RDMA_NLDEV_ATTR_STAT_RES	nlattr[RDMA_NLDEV_ATTR_STAT_RES, flags[nldev_stat_res, int32]]
@@ -135,7 +135,7 @@ nldev_policy_STAT_GET [
 
 nldev_stat_res = RDMA_NLDEV_ATTR_RES_QP, RDMA_NLDEV_ATTR_RES_MR
 
-nldev_policy_STAT_DEL [
+nldev_policy$STAT_DEL [
 	RDMA_NLDEV_ATTR_DEV_INDEX	nlattr[RDMA_NLDEV_ATTR_DEV_INDEX, int32[0:2]]
 	RDMA_NLDEV_ATTR_PORT_INDEX	nlattr[RDMA_NLDEV_ATTR_PORT_INDEX, int32[0:4]]
 	RDMA_NLDEV_ATTR_STAT_RES	nlattr[RDMA_NLDEV_ATTR_STAT_RES, const[RDMA_NLDEV_ATTR_RES_QP, int32]]
diff --git a/sys/linux/socket_netlink_route.txt b/sys/linux/socket_netlink_route.txt
index 93402cb74..07a2fe225 100644
--- a/sys/linux/socket_netlink_route.txt
+++ b/sys/linux/socket_netlink_route.txt
@@ -107,8 +107,8 @@ netlink_msg_route [
 	bridge_setlink		netlink_msg[RTM_SETLINK, ifinfomsg[AF_BRIDGE], ifla_policy]
 	bridge_dellink		netlink_msg[RTM_DELLINK, ifinfomsg[AF_BRIDGE], ifla_policy]
 	bridge_getvlan		netlink_msg[RTM_GETVLAN, br_vlan_msg[AF_BRIDGE], br_vlan_db_dump_pol]
-	bridge_newvlan		netlink_msg[RTM_NEWVLAN, br_vlan_msg[AF_BRIDGE], br_vlan_db_policy_container]
-	bridge_delvlan		netlink_msg[RTM_DELVLAN, br_vlan_msg[AF_BRIDGE], br_vlan_db_policy_container]
+	bridge_newvlan		netlink_msg[RTM_NEWVLAN, br_vlan_msg[AF_BRIDGE], br_vlan_db_policy$container]
+	bridge_delvlan		netlink_msg[RTM_DELVLAN, br_vlan_msg[AF_BRIDGE], br_vlan_db_policy$container]
 
 	RTM_GETMDB		netlink_msg[RTM_GETMDB, br_port_msg[AF_BRIDGE], void]
 	RTM_NEWMDB		netlink_msg[RTM_NEWMDB, br_port_msg[AF_BRIDGE], br_mdb_policy]
@@ -272,47 +272,47 @@ ifal_policy [
 	IFAL_LABEL	nlattr[IFAL_LABEL, flags[ifal_labels, int32]]
 ] [varlen]
 
-type ifla_info_policy_t[TYPE, DATA_TYPE, DATA] {
+type ifla_info_policy$t[TYPE, DATA_TYPE, DATA] {
 	IFLA_INFO_KIND	nlattr[IFLA_INFO_KIND, string[TYPE]]
 	IFLA_INFO_DATA	nlnest[DATA_TYPE, DATA]
 }
 
 # TODO: can, dummy, geneve, ifb, netdevsim, nlmon, vrf, vxlan
 ifla_info_policy [
-	bond		ifla_info_policy_t["bond", IFLA_INFO_DATA, array[bond_policy]]
-	bond_slave	ifla_info_policy_t["bond_slave", IFLA_INFO_SLAVE_DATA, bond_slave_policy]
-	bridge		ifla_info_policy_t["bridge", IFLA_INFO_DATA, array[br_policy]]
-	bridge_slave	ifla_info_policy_t["bridge_slave", IFLA_INFO_SLAVE_DATA, array[br_port_policy]]
-	gre		ifla_info_policy_t["gre", IFLA_INFO_DATA, array[ipgre_policy]]
-	gretap		ifla_info_policy_t["gretap", IFLA_INFO_DATA, array[ipgre_policy]]
-	erspan		ifla_info_policy_t["erspan", IFLA_INFO_DATA, array[ipgre_policy]]
-	ip6gre		ifla_info_policy_t["ip6gre", IFLA_INFO_DATA, array[ip6gre_policy]]
-	ip6gretap	ifla_info_policy_t["ip6gretap", IFLA_INFO_DATA, array[ip6gre_policy]]
-	ip6erspan	ifla_info_policy_t["ip6erspan", IFLA_INFO_DATA, array[ip6gre_policy]]
-	ipip		ifla_info_policy_t["ipip", IFLA_INFO_DATA, array[ipip_policy]]
-	ipip6		ifla_info_policy_t["ip6tnl", IFLA_INFO_DATA, array[ip6_tnl_policy]]
-	sit		ifla_info_policy_t["sit", IFLA_INFO_DATA, array[ipip6_policy]]
-	veth		ifla_info_policy_t["veth", IFLA_INFO_DATA, optional[veth_policy]]
-	vti		ifla_info_policy_t["vti", IFLA_INFO_DATA, array[vti_policy]]
-	ip6vti		ifla_info_policy_t["ip6vti", IFLA_INFO_DATA, array[vti6_policy]]
+	bond		ifla_info_policy$t["bond", IFLA_INFO_DATA, array[bond_policy]]
+	bond_slave	ifla_info_policy$t["bond_slave", IFLA_INFO_SLAVE_DATA, bond_slave_policy]
+	bridge		ifla_info_policy$t["bridge", IFLA_INFO_DATA, array[br_policy]]
+	bridge_slave	ifla_info_policy$t["bridge_slave", IFLA_INFO_SLAVE_DATA, array[br_port_policy]]
+	gre		ifla_info_policy$t["gre", IFLA_INFO_DATA, array[ipgre_policy]]
+	gretap		ifla_info_policy$t["gretap", IFLA_INFO_DATA, array[ipgre_policy]]
+	erspan		ifla_info_policy$t["erspan", IFLA_INFO_DATA, array[ipgre_policy]]
+	ip6gre		ifla_info_policy$t["ip6gre", IFLA_INFO_DATA, array[ip6gre_policy]]
+	ip6gretap	ifla_info_policy$t["ip6gretap", IFLA_INFO_DATA, array[ip6gre_policy]]
+	ip6erspan	ifla_info_policy$t["ip6erspan", IFLA_INFO_DATA, array[ip6gre_policy]]
+	ipip		ifla_info_policy$t["ipip", IFLA_INFO_DATA, array[ipip_policy]]
+	ipip6		ifla_info_policy$t["ip6tnl", IFLA_INFO_DATA, array[ip6_tnl_policy]]
+	sit		ifla_info_policy$t["sit", IFLA_INFO_DATA, array[ipip6_policy]]
+	veth		ifla_info_policy$t["veth", IFLA_INFO_DATA, optional[veth_policy]]
+	vti		ifla_info_policy$t["vti", IFLA_INFO_DATA, array[vti_policy]]
+	ip6vti		ifla_info_policy$t["ip6vti", IFLA_INFO_DATA, array[vti6_policy]]
 # TODO: this should be a net device fd. How does one even obtain these?
-	ppp		ifla_info_policy_t["ppp", IFLA_INFO_DATA, nlattr[IFLA_PPP_DEV_FD, fd]]
+	ppp		ifla_info_policy$t["ppp", IFLA_INFO_DATA, nlattr[IFLA_PPP_DEV_FD, fd]]
 # This is not an array[gtp_policy] intentionally, gtp_policy is a struct.
-	gtp		ifla_info_policy_t["gtp", IFLA_INFO_DATA, gtp_policy]
-	hsr		ifla_info_policy_t["hsr", IFLA_INFO_DATA, array[hsr_policy]]
-	xfrm		ifla_info_policy_t["xfrm", IFLA_INFO_DATA, array[xfrmi_policy]]
-	vcan		ifla_info_policy_t["vcan", IFLA_INFO_DATA, void]
-	vxcan		ifla_info_policy_t["vxcan", IFLA_INFO_DATA, optional[nlattr[VXCAN_INFO_PEER, peer_info]]]
-	vlan		ifla_info_policy_t["vlan", IFLA_INFO_DATA, array[vlan_policy]]
-	ipvlan		ifla_info_policy_t["ipvlan", IFLA_INFO_DATA, array[ipvlan_nl_policy]]
-	macvlan		ifla_info_policy_t["macvlan", IFLA_INFO_DATA, array[macvlan_policy]]
-	macvtap		ifla_info_policy_t["macvtap", IFLA_INFO_DATA, void]
-	macsec		ifla_info_policy_t["macsec", IFLA_INFO_DATA, array[macsec_rtnl_policy]]
-	lowpan		ifla_info_policy_t["lowpan", IFLA_INFO_DATA, void]
-	ipoib		ifla_info_policy_t["ipoib", IFLA_INFO_DATA, array[ipoib_policy]]
-	geneve		ifla_info_policy_t["geneve", IFLA_INFO_DATA, array[geneve_policy]]
-	wireguard	ifla_info_policy_t["wireguard", IFLA_INFO_DATA, void]
-	batadv		ifla_info_policy_t["batadv", IFLA_INFO_DATA, array[batadv_policy]]
+	gtp		ifla_info_policy$t["gtp", IFLA_INFO_DATA, gtp_policy]
+	hsr		ifla_info_policy$t["hsr", IFLA_INFO_DATA, array[hsr_policy]]
+	xfrm		ifla_info_policy$t["xfrm", IFLA_INFO_DATA, array[xfrmi_policy]]
+	vcan		ifla_info_policy$t["vcan", IFLA_INFO_DATA, void]
+	vxcan		ifla_info_policy$t["vxcan", IFLA_INFO_DATA, optional[nlattr[VXCAN_INFO_PEER, peer_info]]]
+	vlan		ifla_info_policy$t["vlan", IFLA_INFO_DATA, array[vlan_policy]]
+	ipvlan		ifla_info_policy$t["ipvlan", IFLA_INFO_DATA, array[ipvlan_nl_policy]]
+	macvlan		ifla_info_policy$t["macvlan", IFLA_INFO_DATA, array[macvlan_policy]]
+	macvtap		ifla_info_policy$t["macvtap", IFLA_INFO_DATA, void]
+	macsec		ifla_info_policy$t["macsec", IFLA_INFO_DATA, array[macsec_rtnl_policy]]
+	lowpan		ifla_info_policy$t["lowpan", IFLA_INFO_DATA, void]
+	ipoib		ifla_info_policy$t["ipoib", IFLA_INFO_DATA, array[ipoib_policy]]
+	geneve		ifla_info_policy$t["geneve", IFLA_INFO_DATA, array[geneve_policy]]
+	wireguard	ifla_info_policy$t["wireguard", IFLA_INFO_DATA, void]
+	batadv		ifla_info_policy$t["batadv", IFLA_INFO_DATA, array[batadv_policy]]
 ] [varlen]
 
 batadv_policy [
@@ -567,7 +567,7 @@ peer_info {
 #	policy optional[ifla_policy]
 }
 
-vti_policy_common [
+vti_policy$common [
 	IFLA_VTI_LINK	nlattr[IFLA_VTI_LINK, ifindex]
 	IFLA_VTI_IKEY	nlattr[IFLA_VTI_IKEY, int32]
 	IFLA_VTI_OKEY	nlattr[IFLA_VTI_OKEY, int32]
@@ -577,13 +577,13 @@ vti_policy_common [
 vti_policy [
 	IFLA_VTI_LOCAL		nlattr[IFLA_VTI_LOCAL, ipv4_addr]
 	IFLA_VTI_REMOTE		nlattr[IFLA_VTI_REMOTE, ipv4_addr]
-	vti_common_policy	array[vti_policy_common]
+	vti_common_policy	array[vti_policy$common]
 ] [varlen]
 
 vti6_policy [
 	IFLA_VTI_LOCAL		nlattr[IFLA_VTI_LOCAL, ipv6_addr]
 	IFLA_VTI_REMOTE		nlattr[IFLA_VTI_REMOTE, ipv6_addr]
-	vti_common_policy	array[vti_policy_common]
+	vti_common_policy	array[vti_policy$common]
 ] [varlen]
 
 ipip_policy [
@@ -824,7 +824,7 @@ br_vlan_db_dump_pol [
 	BRIDGE_VLANDB_DUMP_FLAGS	nlattr[BRIDGE_VLANDB_DUMP_FLAGS, flags[br_vlan_dumpflags, int32]]
 ]
 
-br_vlan_db_policy_container [
+br_vlan_db_policy$container [
 	BRIDGE_VLANDB_ENTRY	nlnest[BRIDGE_VLANDB_ENTRY, br_vlan_db_policy]
 ] [varlen]
 
@@ -1063,7 +1063,7 @@ lwtunnel_policy [
 	SEG6_LOCAL_NH6		nlattr[SEG6_LOCAL_NH6, ipv6_addr]
 	SEG6_LOCAL_IIF		nlattr[SEG6_LOCAL_IIF, int32]
 	SEG6_LOCAL_OIF		nlattr[SEG6_LOCAL_OIF, int32]
-	SEG6_LOCAL_BPF		nlnest[SEG6_LOCAL_BPF, bpf_prog_policy_seg6_local]
+	SEG6_LOCAL_BPF		nlnest[SEG6_LOCAL_BPF, bpf_prog_policy$seg6_local]
 
 	RPL_IPTUNNEL_SRH	nlattr[RPL_IPTUNNEL_SRH, ipv6_rpl_sr_hdr]
 ] [varlen]
@@ -1071,22 +1071,22 @@ lwtunnel_policy [
 lwtunnel_ip_flags = TUNNEL_GENEVE_OPT, TUNNEL_VXLAN_OPT, TUNNEL_ERSPAN_OPT
 
 ip_opts_policy [
-	LWTUNNEL_IP_OPTS_GENEVE	nlnest[LWTUNNEL_IP_OPTS_GENEVE, geneve_opt_policy_lwt]
-	LWTUNNEL_IP_OPTS_VXLAN	nlnest[LWTUNNEL_IP_OPTS_VXLAN, vxlan_opt_policy_lwt]
-	LWTUNNEL_IP_OPTS_ERSPAN	nlnest[LWTUNNEL_IP_OPTS_ERSPAN, erspan_opt_policy_lwt]
+	LWTUNNEL_IP_OPTS_GENEVE	nlnest[LWTUNNEL_IP_OPTS_GENEVE, geneve_opt_policy$lwt]
+	LWTUNNEL_IP_OPTS_VXLAN	nlnest[LWTUNNEL_IP_OPTS_VXLAN, vxlan_opt_policy$lwt]
+	LWTUNNEL_IP_OPTS_ERSPAN	nlnest[LWTUNNEL_IP_OPTS_ERSPAN, erspan_opt_policy$lwt]
 ] [varlen]
 
-geneve_opt_policy_lwt [
+geneve_opt_policy$lwt [
 	LWTUNNEL_IP_OPT_GENEVE_CLASS	nlattr[LWTUNNEL_IP_OPT_GENEVE_CLASS, int16be]
 	LWTUNNEL_IP_OPT_GENEVE_TYPE	nlattr[LWTUNNEL_IP_OPT_GENEVE_TYPE, int8]
 	LWTUNNEL_IP_OPT_GENEVE_DATA	nlattr[LWTUNNEL_IP_OPT_GENEVE_DATA, array[int8, 0:128]]
 ] [varlen]
 
-vxlan_opt_policy_lwt [
+vxlan_opt_policy$lwt [
 	LWTUNNEL_IP_OPT_VXLAN_GBP	nlattr[LWTUNNEL_IP_OPT_VXLAN_GBP, int32]
 ] [varlen]
 
-erspan_opt_policy_lwt [
+erspan_opt_policy$lwt [
 	LWTUNNEL_IP_OPT_ERSPAN_VER	nlattr[LWTUNNEL_IP_OPT_ERSPAN_VER, int8[1:2]]
 	LWTUNNEL_IP_OPT_ERSPAN_INDEX	nlattr[LWTUNNEL_IP_OPT_ERSPAN_INDEX, int32be]
 	LWTUNNEL_IP_OPT_ERSPAN_DIR	nlattr[LWTUNNEL_IP_OPT_ERSPAN_DIR, int8]
@@ -1098,7 +1098,7 @@ bpf_prog_policy [
 	LWT_BPF_PROG_NAME	nlattr[LWT_BPF_PROG_NAME, string]
 ] [varlen]
 
-bpf_prog_policy_seg6_local [
+bpf_prog_policy$seg6_local [
 	SEG6_LOCAL_BPF_PROG		nlattr[SEG6_LOCAL_BPF_PROG, fd_bpf_prog]
 	SEG6_LOCAL_BPF_PROG_NAME	nlattr[SEG6_LOCAL_BPF_PROG_NAME, string]
 ] [varlen]
diff --git a/sys/linux/socket_netlink_route_sched.txt b/sys/linux/socket_netlink_route_sched.txt
index 581304b7c..fc67781b4 100644
--- a/sys/linux/socket_netlink_route_sched.txt
+++ b/sys/linux/socket_netlink_route_sched.txt
@@ -42,8 +42,8 @@ netlink_msg_route_sched [
 	newqdisc	netlink_msg[RTM_NEWQDISC, tcmsg[AF_UNSPEC], rtm_tca_policy]
 	delqdisc	netlink_msg[RTM_DELQDISC, tcmsg[AF_UNSPEC], rtm_tca_policy]
 	getqdisc	netlink_msg[RTM_GETQDISC, tcmsg[AF_UNSPEC], nlattr[TCA_DUMP_INVISIBLE, void]]
-	newtclass	netlink_msg[RTM_NEWTCLASS, tcmsg[AF_UNSPEC], rtm_tca_policy_tclass]
-	deltclass	netlink_msg[RTM_DELTCLASS, tcmsg[AF_UNSPEC], rtm_tca_policy_tclass]
+	newtclass	netlink_msg[RTM_NEWTCLASS, tcmsg[AF_UNSPEC], rtm_tca_policy$tclass]
+	deltclass	netlink_msg[RTM_DELTCLASS, tcmsg[AF_UNSPEC], rtm_tca_policy$tclass]
 	gettclass	netlink_msg[RTM_GETTCLASS, tcmsg[AF_UNSPEC], void]
 	newtfilter	netlink_msg[RTM_NEWTFILTER, tcmsg[AF_UNSPEC], filter_policy]
 	deltfilter	netlink_msg[RTM_DELTFILTER, tcmsg[AF_UNSPEC], filter_policy]
@@ -85,7 +85,7 @@ rtm_tca_policy [
 	TCA_EGRESS_BLOCK	nlattr[TCA_EGRESS_BLOCK, int32]
 ] [varlen]
 
-rtm_tca_policy_tclass [
+rtm_tca_policy$tclass [
 	tclass_kind_options	tclass_kind_options
 	TCA_RATE		nlattr[TCA_RATE, tc_estimator]
 ] [varlen]
@@ -342,7 +342,7 @@ sfb_policy [
 	TCA_SFB_PARMS	nlattr[TCA_SFB_PARMS, tc_sfb_qopt]
 ] [varlen]
 
-entry_policy_taprio [
+entry_policy$taprio [
 	TCA_TAPRIO_SCHED_ENTRY_CMD		nlattr[TCA_TAPRIO_SCHED_ENTRY_CMD, int8]
 	TCA_TAPRIO_SCHED_ENTRY_GATE_MASK	nlattr[TCA_TAPRIO_SCHED_ENTRY_GATE_MASK, int32]
 	TCA_TAPRIO_SCHED_ENTRY_INTERVAL		nlattr[TCA_TAPRIO_SCHED_ENTRY_INTERVAL, int32]
@@ -350,7 +350,7 @@ entry_policy_taprio [
 
 taprio_policy [
 	TCA_TAPRIO_ATTR_PRIOMAP				nlattr[TCA_TAPRIO_ATTR_PRIOMAP, tc_mqprio_qopt]
-	TCA_TAPRIO_ATTR_SCHED_ENTRY_LIST		nlnest[TCA_TAPRIO_ATTR_SCHED_ENTRY_LIST, array[nlnest[TCA_TAPRIO_SCHED_ENTRY, array[entry_policy_taprio]]]]
+	TCA_TAPRIO_ATTR_SCHED_ENTRY_LIST		nlnest[TCA_TAPRIO_ATTR_SCHED_ENTRY_LIST, array[nlnest[TCA_TAPRIO_SCHED_ENTRY, array[entry_policy$taprio]]]]
 	TCA_TAPRIO_ATTR_SCHED_BASE_TIME			nlattr[TCA_TAPRIO_ATTR_SCHED_BASE_TIME, int64]
 	TCA_TAPRIO_ATTR_SCHED_CLOCKID			nlattr[TCA_TAPRIO_ATTR_SCHED_CLOCKID, int32]
 	TCA_TAPRIO_ATTR_SCHED_CYCLE_TIME		nlattr[TCA_TAPRIO_ATTR_SCHED_CYCLE_TIME, int64]
@@ -590,9 +590,9 @@ tclass_kind_options [
 	c_atm		tca_kind_options_t["atm", array[atm_policy]]
 	c_cbq		tca_kind_options_t["cbq", array[cbq_policy]]
 	c_drr		tca_kind_options_t["drr", drr_policy]
-	c_dsmark	tca_kind_options_t["dsmark", dsmark_policy_class]
+	c_dsmark	tca_kind_options_t["dsmark", dsmark_policy$class]
 	c_hfsc		tca_kind_options_t["hfsc", array[hfsc_policy]]
-	c_htb		tca_kind_options_t["htb", array[htb_policy_class]]
+	c_htb		tca_kind_options_t["htb", array[htb_policy$class]]
 	c_qfq		tca_kind_options_t["qfq", array[qfq_policy]]
 	c_cake		nlattr[TCA_KIND, string["cake"]]
 	c_cbs		nlattr[TCA_KIND, string["cbs"]]
@@ -622,12 +622,12 @@ drr_policy [
 	TCA_DRR_QUANTUM	nlattr[TCA_DRR_QUANTUM, int32]
 ] [varlen]
 
-dsmark_policy_class [
+dsmark_policy$class [
 	TCA_DSMARK_MASK		nlattr[TCA_DSMARK_MASK, int8]
 	TCA_DSMARK_VALUE	nlattr[TCA_DSMARK_VALUE, int8]
 ] [varlen]
 
-htb_policy_class [
+htb_policy$class [
 	TCA_HTB_PARMS	nlattr[TCA_HTB_PARMS, tc_htb_opt]
 	TCA_HTB_CTAB	nlattr[TCA_HTB_CTAB, array[int32, 256]]
 	TCA_HTB_RTAB	nlattr[TCA_HTB_RTAB, array[int32, 256]]
@@ -661,7 +661,7 @@ filter_kind_options [
 	f_matchall	tca_kind_options_t["matchall", array[mall_policy]]
 	f_route		tca_kind_options_t["route", array[route4_policy]]
 	f_rsvp		tca_kind_options_t["rsvp", array[rsvp_policy]]
-	f_rsvp6		tca_kind_options_t["rsvp6", array[rsvp_policy_ipv6]]
+	f_rsvp6		tca_kind_options_t["rsvp6", array[rsvp_policy$ipv6]]
 	f_tcindex	tca_kind_options_t["tcindex", array[tcindex_policy]]
 	f_u32		tca_kind_options_t["u32", array[u32_policy]]
 ] [varlen]
@@ -677,15 +677,15 @@ bpf_policy [
 	TCA_BPF_ACT		nlattr[TCA_BPF_ACT, array[tca_actions]]
 	TCA_BPF_POLICE		nlattr[TCA_BPF_POLICE, array[police_policy]]
 	TCA_BPF_CLASSID		nlattr[TCA_BPF_CLASSID, tcm_handle]
-	TCA_BPF_OPS		bpf_policy_ops
+	TCA_BPF_OPS		bpf_policy$ops
 	TCA_BPF_FD		nlattr[TCA_BPF_FD, fd_bpf_prog]
 	TCA_BPF_NAME		nlattr[TCA_BPF_NAME, string[filename]]
 	TCA_BPF_FLAGS		nlattr[TCA_BPF_FLAGS, int32[0:1]]
 	TCA_BPF_FLAGS_GEN	nlattr[TCA_BPF_FLAGS_GEN, int32[0:8]]
 ] [varlen]
 
-bpf_policy_ops {
-	TCA_BPF_OPS_LEN	nlattr[TCA_BPF_OPS_LEN, len[bpf_policy_ops:TCA_BPF_OPS:payload, int16]]
+bpf_policy$ops {
+	TCA_BPF_OPS_LEN	nlattr[TCA_BPF_OPS_LEN, len[bpf_policy$ops:TCA_BPF_OPS:payload, int16]]
 	TCA_BPF_OPS	nlattr[TCA_BPF_OPS, array[sock_filter]]
 } [packed]
 
@@ -878,7 +878,7 @@ rsvp_policy [
 	TCA_RSVP_ACT		nlattr[TCA_RSVP_ACT, array[tca_actions]]
 ] [varlen]
 
-rsvp_policy_ipv6 [
+rsvp_policy$ipv6 [
 	TCA_RSVP_CLASSID	nlattr[TCA_RSVP_CLASSID, tcm_handle]
 	TCA_RSVP_DST		nlattr[TCA_RSVP_DST, ipv6_addr]
 	TCA_RSVP_SRC		nlattr[TCA_RSVP_SRC, ipv6_addr]
@@ -967,7 +967,7 @@ tca_actions [
 	m_skbedit	nlattr_tca_actions[tcf_action_policy["skbedit", skbedit_policy]]
 	m_skbmod	nlattr_tca_actions[tcf_action_policy["skbmod", skbmod_policy]]
 	m_tunnel_key	nlattr_tca_actions[tcf_action_policy["tunnel_key", tunnel_key_policy]]
-	m_vlan		nlattr_tca_actions[tcf_action_policy["vlan", vlan_policy_act]]
+	m_vlan		nlattr_tca_actions[tcf_action_policy["vlan", vlan_policy$act]]
 ] [varlen]
 
 type tcf_action_policy[NAME, VALUES] {
@@ -1122,7 +1122,7 @@ tunnel_key_policy [
 	TCA_TUNNEL_KEY_NO_CSUM		nlattr[TCA_TUNNEL_KEY_NO_CSUM, int8[0:1]]
 ] [varlen]
 
-vlan_policy_act [
+vlan_policy$act [
 	TCA_VLAN_PARMS			nlattr[TCA_VLAN_PARMS, tc_vlan]
 	TCA_VLAN_PUSH_VLAN_ID		nlattr[TCA_VLAN_PUSH_VLAN_ID, int16[0:0xfff]]
 	TCA_VLAN_PUSH_VLAN_PROTOCOL	nlattr[TCA_VLAN_PUSH_VLAN_PROTOCOL, flags[vlan_proto, int16be]]
@@ -1130,10 +1130,10 @@ vlan_policy_act [
 ] [varlen]
 
 action_gd_policy [
-	TCA_ACT_TAB	nlattr[TCA_ACT_TAB, array[nlattr_tca_actions[tcf_action_policy_kind_index]]]
+	TCA_ACT_TAB	nlattr[TCA_ACT_TAB, array[nlattr_tca_actions[tcf_action_policy$kind_index]]]
 ] [varlen]
 
-tcf_action_policy_kind_index [
+tcf_action_policy$kind_index [
 	TCA_ACT_KIND	nlattr[TCA_ACT_KIND, string[tca_actions_kinds]]
 	TCA_ACT_INDEX	nlattr[TCA_ACT_INDEX, int32]
 ] [varlen]
diff --git a/tools/syz-check/check.go b/tools/syz-check/check.go
index 6f59a1fa6..91f5ead47 100644
--- a/tools/syz-check/check.go
+++ b/tools/syz-check/check.go
@@ -413,7 +413,7 @@ func checkNetlinkStruct(locs map[string]*ast.Struct, symbols map[string][]symbol
 		return nil, nil
 	}
 	// In some cases we split a single policy into multiple ones (more precise description),
-	// so try to match our foo$bar with with kernel foo as well.
+	// so try to match our foo$bar with kernel foo as well.
 	kernelName, ss := name, symbols[name]
 	if delim := strings.LastIndexByte(name, '$'); len(ss) == 0 && delim != -1 {
 		kernelName = name[:delim]