sys/linux: update consts

Update dev_vhci consts as they were updated to use inclusive language in
commit 3d4f9c00492b and 6397729bb74d.
Remove caif_hsi consts as they were removed in commit ca75bcf0a83b.
Remove raw driver ioctls as they were removed in commit 603e4922f1c8.

7 files changed, 25 insertions, 131 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 25f3684a9..82ea7707b 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -33,6 +33,7 @@ Google Inc.
  Pi-Hsun Shih
  Stephen Boyd
  Patrick Meyer
+ Zi Fan Tan
 Baozeng Ding
 Lorenzo Stoakes
 Jeremy Huang
diff --git a/sys/linux/dev_char_raw.txt b/sys/linux/dev_char_raw.txt
deleted file mode 100644
index 2c9ff06b0..000000000
--- a/sys/linux/dev_char_raw.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2020 syzkaller project authors. All rights reserved.
-# Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
-
-# drivers/char/raw.c
-include <linux/raw.h>
-
-resource fd_char_raw[fd]
-resource fd_char_raw_ctl[fd]
-
-openat$char_raw_ctl(fd const[AT_FDCWD], file ptr[in, string["/dev/raw/rawctl"]], flags flags[open_flags], mode const[0]) fd_char_raw_ctl
-# /dev/raw/raw# only exists if ioctl$RAW_CHAR_CTRL_SETBIND executed first.
-syz_open_dev$char_raw(file ptr[in, string["/dev/raw/raw#"]], raw_minor proc[1, 2], flags flags[open_flags]) fd_char_raw
-
-read$char_raw(fd fd_char_raw, buf ptr[out, raw_char_buffer], count len[buf])
-write$char_raw(fd fd_char_raw, buf ptr[in, raw_char_buffer], count len[buf])
-
-raw_char_buffer {
-	buf	array[int8, 1:65536]
-} [align[512]]
-
-# IOCTL on /dev/raw/rawctl
-ioctl$RAW_CHAR_CTRL_SETBIND(fd fd_char_raw_ctl, cmd const[RAW_SETBIND], arg ptr[in, raw_bind_info])
-ioctl$RAW_CHAR_CTRL_GETBIND(fd fd_char_raw_ctl, cmd const[RAW_GETBIND], arg ptr[inout, raw_bind_info])
-
-# TODO: add other suitable major types
-raw_bind_info {
-	raw_minor	proc[1, 2, int32]
-	block_major	const[LOOP_MAJOR, int64]
-	block_minor	proc[0, 1, int64]
-}
-
-# IOCTL on /dev/raw/rawN
-# similar to dev_block.txt - redefined for fd_char_raw
-include <linux/blkdev.h>
-ioctl$CHAR_RAW_FLSBUF(fd fd_char_raw, cmd const[BLKFLSBUF], arg ptr[in, intptr])
-ioctl$CHAR_RAW_ROSET(fd fd_char_raw, cmd const[BLKROSET], arg ptr[in, intptr])
-ioctl$CHAR_RAW_DISCARD(fd fd_char_raw, cmd const[BLKDISCARD], arg ptr[in, intptr])
-ioctl$CHAR_RAW_SECDISCARD(fd fd_char_raw, cmd const[BLKSECDISCARD], arg ptr[in, intptr])
-ioctl$CHAR_RAW_ZEROOUT(fd fd_char_raw, cmd const[BLKZEROOUT], arg ptr[in, blk_zone_range])
-ioctl$CHAR_RAW_REPORTZONE(fd fd_char_raw, cmd const[BLKREPORTZONE], arg ptr[in, blk_zone_report])
-ioctl$CHAR_RAW_RESETZONE(fd fd_char_raw, cmd const[BLKRESETZONE], arg ptr[in, blk_zone_range])
-ioctl$CHAR_RAW_RAGET(fd fd_char_raw, cmd const[BLKRAGET], arg ptr[out, intptr])
-ioctl$CHAR_RAW_ROGET(fd fd_char_raw, cmd const[BLKROGET], arg ptr[out, intptr])
-ioctl$CHAR_RAW_BSZGET(fd fd_char_raw, cmd const[BLKBSZGET], arg ptr[out, intptr])
-ioctl$CHAR_RAW_PBSZGET(fd fd_char_raw, cmd const[BLKPBSZGET], arg ptr[out, intptr])
-ioctl$CHAR_RAW_IOMIN(fd fd_char_raw, cmd const[BLKIOMIN], arg ptr[out, intptr])
-ioctl$CHAR_RAW_IOOPT(fd fd_char_raw, cmd const[BLKIOOPT], arg ptr[out, intptr])
-ioctl$CHAR_RAW_ALIGNOFF(fd fd_char_raw, cmd const[BLKALIGNOFF], arg ptr[out, intptr])
-ioctl$CHAR_RAW_SECTGET(fd fd_char_raw, cmd const[BLKSECTGET], arg ptr[out, intptr])
-ioctl$CHAR_RAW_ROTATIONAL(fd fd_char_raw, cmd const[BLKROTATIONAL], arg ptr[out, intptr])
-ioctl$CHAR_RAW_FRASET(fd fd_char_raw, cmd const[BLKFRASET], arg ptr[in, intptr])
-ioctl$CHAR_RAW_BSZSET(fd fd_char_raw, cmd const[BLKBSZSET], arg ptr[in, intptr])
-ioctl$CHAR_RAW_PG(fd fd_char_raw, cmd const[BLKPG], arg ptr[in, blkpg_ioctl_arg])
-ioctl$CHAR_RAW_RRPART(fd fd_char_raw, cmd const[BLKRRPART], arg const[0])
-ioctl$CHAR_RAW_GETSIZE(fd fd_char_raw, cmd const[BLKGETSIZE], arg ptr[out, intptr])
-ioctl$CHAR_RAW_GETSIZE64(fd fd_char_raw, cmd const[BLKGETSIZE64], arg ptr[out, int64])
-ioctl$CHAR_RAW_HDIO_GETGEO(fd fd_char_raw, cmd const[HDIO_GETGEO], arg ptr[out, hd_geometry])
diff --git a/sys/linux/dev_char_raw.txt.const b/sys/linux/dev_char_raw.txt.const
deleted file mode 100644
index bb572ba81..000000000
--- a/sys/linux/dev_char_raw.txt.const
+++ /dev/null
@@ -1,33 +0,0 @@
-# Code generated by syz-sysgen. DO NOT EDIT.
-arches = 386, amd64, arm, arm64, mips64le, ppc64le, riscv64, s390x
-AT_FDCWD = 18446744073709551516
-BLKALIGNOFF = 4730, mips64le:ppc64le:536875642
-BLKBSZGET = 2148012656, 386:arm:2147750512, mips64le:ppc64le:1074270832
-BLKBSZSET = 1074270833, 386:arm:1074008689, mips64le:ppc64le:2148012657
-BLKDISCARD = 4727, mips64le:ppc64le:536875639
-BLKFLSBUF = 4705, mips64le:ppc64le:536875617
-BLKFRASET = 4708, mips64le:ppc64le:536875620
-BLKGETSIZE = 4704, mips64le:ppc64le:536875616
-BLKGETSIZE64 = 2148012658, 386:arm:2147750514, mips64le:ppc64le:1074270834
-BLKIOMIN = 4728, mips64le:ppc64le:536875640
-BLKIOOPT = 4729, mips64le:ppc64le:536875641
-BLKPBSZGET = 4731, mips64le:ppc64le:536875643
-BLKPG = ???
-BLKRAGET = 4707, mips64le:ppc64le:536875619
-BLKREPORTZONE = 3222278786
-BLKRESETZONE = 1074795139, mips64le:ppc64le:2148536963
-BLKROGET = 4702, mips64le:ppc64le:536875614
-BLKROSET = 4701, mips64le:ppc64le:536875613
-BLKROTATIONAL = 4734, mips64le:ppc64le:536875646
-BLKRRPART = 4703, mips64le:ppc64le:536875615
-BLKSECDISCARD = 4733, mips64le:ppc64le:536875645
-BLKSECTGET = 4711, mips64le:ppc64le:536875623
-BLKZEROOUT = 4735, mips64le:ppc64le:536875647
-HDIO_GETGEO = ???
-LOOP_MAJOR = 7
-RAW_GETBIND = 44033, mips64le:ppc64le:536914945
-RAW_SETBIND = 44032, mips64le:ppc64le:536914944
-__NR_ioctl = 54, amd64:16, arm64:riscv64:29, mips64le:5015
-__NR_openat = 56, 386:295, amd64:257, arm:322, mips64le:5247, ppc64le:286, s390x:288
-__NR_read = 3, amd64:0, arm64:riscv64:63, mips64le:5000
-__NR_write = 4, amd64:1, arm64:riscv64:64, mips64le:5001
diff --git a/sys/linux/dev_vhci.txt b/sys/linux/dev_vhci.txt
index 7c87a7db1..842c82a17 100644
--- a/sys/linux/dev_vhci.txt
+++ b/sys/linux/dev_vhci.txt
@@ -110,14 +110,14 @@ hci_command_hdr_un [
 	io_capability_reply		hci_command_packet_t[HCI_OP_IO_CAPABILITY_REPLY, hci_cp_io_capability_reply]
 	le_accept_cis			hci_command_packet_t[HCI_OP_LE_ACCEPT_CIS, hci_cp_le_accept_cis]
 	le_add_to_resolv_list		hci_command_packet_t[HCI_OP_LE_ADD_TO_RESOLV_LIST, hci_cp_le_add_to_resolv_list]
-	le_add_to_white_list		hci_command_packet_t[HCI_OP_LE_ADD_TO_WHITE_LIST, hci_cp_le_add_to_white_list]
+	le_add_to_accept_list		hci_command_packet_t[HCI_OP_LE_ADD_TO_ACCEPT_LIST, hci_cp_le_add_to_accept_list]
 	le_conn_param_req_neg_reply	hci_command_packet_t[HCI_OP_LE_CONN_PARAM_REQ_NEG_REPLY, hci_cp_le_conn_param_req_neg_reply]
 	le_conn_param_req_reply		hci_command_packet_t[HCI_OP_LE_CONN_PARAM_REQ_REPLY, hci_cp_le_conn_param_req_reply]
 	le_conn_update			hci_command_packet_t[HCI_OP_LE_CONN_UPDATE, hci_cp_le_conn_update]
 	le_create_cis			hci_command_packet_t[HCI_OP_LE_CREATE_CIS, hci_cp_le_create_cis]
 	le_create_conn			hci_command_packet_t[HCI_OP_LE_CREATE_CONN, hci_cp_le_create_conn]
 	le_del_from_resolv_list		hci_command_packet_t[HCI_OP_LE_DEL_FROM_RESOLV_LIST, hci_cp_le_del_from_resolv_list]
-	le_del_from_white_list		hci_command_packet_t[HCI_OP_LE_DEL_FROM_WHITE_LIST, hci_cp_le_del_from_white_list]
+	le_del_from_accept_list		hci_command_packet_t[HCI_OP_LE_DEL_FROM_ACCEPT_LIST, hci_cp_le_del_from_accept_list]
 	le_ext_create_conn		hci_command_packet_t[HCI_OP_LE_EXT_CREATE_CONN, hci_cp_le_ext_create_conn]
 	le_ltk_neg_reply		hci_command_packet_t[HCI_OP_LE_LTK_NEG_REPLY, hci_cp_le_ltk_neg_reply]
 	le_ltk_reply			hci_command_packet_t[HCI_OP_LE_LTK_REPLY, hci_cp_le_ltk_reply]
@@ -170,8 +170,8 @@ hci_command_hdr_un [
 	remote_oob_ext_data_reply	hci_command_packet_t[HCI_OP_REMOTE_OOB_EXT_DATA_REPLY, hci_cp_remote_oob_ext_data_reply]
 	role_discovery			hci_command_packet_t[HCI_OP_ROLE_DISCOVERY, hci_cp_role_discovery]
 	set_conn_encrypt		hci_command_packet_t[HCI_OP_SET_CONN_ENCRYPT, hci_cp_set_conn_encrypt]
-	set_csb				hci_command_packet_t[HCI_OP_SET_CSB, hci_cp_set_csb]
-	set_csb_data			hci_command_packet_t[HCI_OP_SET_CSB_DATA, hci_cp_set_csb_data]
+	set_cpb				hci_command_packet_t[HCI_OP_SET_CPB, hci_cp_set_cpb]
+	set_cpb_data			hci_command_packet_t[HCI_OP_SET_CPB_DATA, hci_cp_set_cpb_data]
 	set_reserved_lt_addr		hci_command_packet_t[HCI_OP_SET_RESERVED_LT_ADDR, hci_cp_set_reserved_lt_addr]
 	setup_sync_conn			hci_command_packet_t[HCI_OP_SETUP_SYNC_CONN, hci_cp_setup_sync_conn]
 	sniff_mode			hci_command_packet_t[HCI_OP_SNIFF_MODE, hci_cp_sniff_mode]
@@ -335,7 +335,7 @@ hci_cp_le_add_to_resolv_list {
 	local_irk	array[int8, 16]
 } [packed]
 
-hci_cp_le_add_to_white_list {
+hci_cp_le_add_to_accept_list {
 	bdaddr_type	int8
 	bdaddr		bdaddr_t
 } [packed]
@@ -390,7 +390,7 @@ hci_cp_le_del_from_resolv_list {
 	bdaddr		bdaddr_t
 } [packed]
 
-hci_cp_le_del_from_white_list {
+hci_cp_le_del_from_accept_list {
 	bdaddr_type	int8
 	bdaddr		bdaddr_t
 } [packed]
@@ -694,17 +694,17 @@ hci_cp_set_conn_encrypt {
 	encrypt	int8
 } [packed]
 
-hci_cp_set_csb {
+hci_cp_set_cpb {
 	enable		int8
 	lt_addr		int8
 	lpo_allowed	int8
 	packet_type	int16
 	interval_min	int16
 	interval_max	int16
-	csb_sv_tout	int16
+	cpb_sv_tout	int16
 } [packed]
 
-hci_cp_set_csb_data {
+hci_cp_set_cpb_data {
 	lt_addr		int8
 	fragment	int8
 	data_length	int8
@@ -932,7 +932,7 @@ hci_ev_cmd_complete_un [
 	hci_rp_le_read_num_supported_adv_sets	hci_ev_cmd_complete_t[HCI_OP_LE_READ_NUM_SUPPORTED_ADV_SETS, hci_rp_le_read_num_supported_adv_sets]
 	hci_rp_le_read_resolv_list_size		hci_ev_cmd_complete_t[HCI_OP_LE_READ_RESOLV_LIST_SIZE, hci_rp_le_read_resolv_list_size]
 	hci_rp_le_read_supported_states		hci_ev_cmd_complete_t[HCI_OP_LE_READ_SUPPORTED_STATES, hci_rp_le_read_supported_states]
-	hci_rp_le_read_white_list_size		hci_ev_cmd_complete_t[HCI_OP_LE_READ_WHITE_LIST_SIZE, hci_rp_le_read_white_list_size]
+	hci_rp_le_read_accept_list_size		hci_ev_cmd_complete_t[HCI_OP_LE_READ_ACCEPT_LIST_SIZE, hci_rp_le_read_accept_list_size]
 	hci_rp_le_set_cig_params		hci_ev_cmd_complete_t[HCI_OP_LE_SET_CIG_PARAMS, hci_rp_le_set_cig_params]
 	hci_rp_le_set_data_len			hci_ev_cmd_complete_t[HCI_OP_LE_SET_DATA_LEN, hci_rp_le_set_data_len]
 	hci_rp_le_set_ext_adv_params		hci_ev_cmd_complete_t[HCI_OP_LE_SET_EXT_ADV_PARAMS, hci_rp_le_set_ext_adv_params]
@@ -971,8 +971,8 @@ hci_ev_cmd_complete_un [
 	hci_rp_read_tx_power			hci_ev_cmd_complete_t[HCI_OP_READ_TX_POWER, hci_rp_read_tx_power]
 	hci_rp_read_voice_setting		hci_ev_cmd_complete_t[HCI_OP_READ_VOICE_SETTING, hci_rp_read_voice_setting]
 	hci_rp_role_discovery			hci_ev_cmd_complete_t[HCI_OP_ROLE_DISCOVERY, hci_rp_role_discovery]
-	hci_rp_set_csb				hci_ev_cmd_complete_t[HCI_OP_SET_CSB, hci_rp_set_csb]
-	hci_rp_set_csb_data			hci_ev_cmd_complete_t[HCI_OP_SET_CSB_DATA, hci_rp_set_csb_data]
+	hci_rp_set_cpb				hci_ev_cmd_complete_t[HCI_OP_SET_CPB, hci_rp_set_cpb]
+	hci_rp_set_cpb_data			hci_ev_cmd_complete_t[HCI_OP_SET_CPB_DATA, hci_rp_set_cpb_data]
 	hci_rp_set_reserved_lt_addr		hci_ev_cmd_complete_t[HCI_OP_SET_RESERVED_LT_ADDR, hci_rp_set_reserved_lt_addr]
 	hci_rp_user_confirm_reply		hci_ev_cmd_complete_t[HCI_OP_USER_CONFIRM_REPLY, hci_rp_user_confirm_reply]
 	hci_rp_write_auth_payload_to		hci_ev_cmd_complete_t[HCI_OP_WRITE_AUTH_PAYLOAD_TO, hci_rp_write_auth_payload_to]
@@ -1004,9 +1004,9 @@ hci_ev_cmd_complete_un [
 	HCI_OP_LE_SET_ADV_ENABLE		hci_ev_cmd_complete_t[HCI_OP_LE_SET_ADV_ENABLE, int8]
 	HCI_OP_LE_SET_SCAN_PARAM		hci_ev_cmd_complete_t[HCI_OP_LE_SET_SCAN_PARAM, int8]
 	HCI_OP_LE_SET_SCAN_ENABLE		hci_ev_cmd_complete_t[HCI_OP_LE_SET_SCAN_ENABLE, int8]
-	HCI_OP_LE_CLEAR_WHITE_LIST		hci_ev_cmd_complete_t[HCI_OP_LE_CLEAR_WHITE_LIST, int8]
-	HCI_OP_LE_ADD_TO_WHITE_LIST		hci_ev_cmd_complete_t[HCI_OP_LE_ADD_TO_WHITE_LIST, int8]
-	HCI_OP_LE_DEL_FROM_WHITE_LIST		hci_ev_cmd_complete_t[HCI_OP_LE_DEL_FROM_WHITE_LIST, int8]
+	HCI_OP_LE_CLEAR_ACCEPT_LIST		hci_ev_cmd_complete_t[HCI_OP_LE_CLEAR_ACCEPT_LIST, int8]
+	HCI_OP_LE_ADD_TO_ACCEPT_LIST		hci_ev_cmd_complete_t[HCI_OP_LE_ADD_TO_ACCEPT_LIST, int8]
+	HCI_OP_LE_DEL_FROM_ACCEPT_LIST		hci_ev_cmd_complete_t[HCI_OP_LE_DEL_FROM_ACCEPT_LIST, int8]
 	HCI_OP_LE_WRITE_DEF_DATA_LEN		hci_ev_cmd_complete_t[HCI_OP_LE_WRITE_DEF_DATA_LEN, int8]
 	HCI_OP_LE_ADD_TO_RESOLV_LIST		hci_ev_cmd_complete_t[HCI_OP_LE_ADD_TO_RESOLV_LIST, int8]
 	HCI_OP_LE_DEL_FROM_RESOLV_LIST		hci_ev_cmd_complete_t[HCI_OP_LE_DEL_FROM_RESOLV_LIST, int8]
@@ -1552,7 +1552,7 @@ hci_rp_le_read_supported_states {
 	le_states	array[int8, 8]
 } [packed]
 
-hci_rp_le_read_white_list_size {
+hci_rp_le_read_accept_list_size {
 	status	int8
 	size	int8
 } [packed]
@@ -1787,13 +1787,13 @@ hci_rp_role_discovery {
 	role	int8
 } [packed]
 
-hci_rp_set_csb {
+hci_rp_set_cpb {
 	status		int8
 	lt_addr		int8
 	interval	int16
 } [packed]
 
-hci_rp_set_csb_data {
+hci_rp_set_cpb_data {
 	status	int8
 	lt_addr	int8
 } [packed]
diff --git a/sys/linux/dev_vhci.txt.const b/sys/linux/dev_vhci.txt.const
index cb178945d..21399d062 100644
--- a/sys/linux/dev_vhci.txt.const
+++ b/sys/linux/dev_vhci.txt.const
@@ -100,20 +100,21 @@ HCI_OP_INQUIRY_CANCEL = 1026
 HCI_OP_IO_CAPABILITY_NEG_REPLY = 1076
 HCI_OP_IO_CAPABILITY_REPLY = 1067
 HCI_OP_LE_ACCEPT_CIS = 8294
+HCI_OP_LE_ADD_TO_ACCEPT_LIST = 8209
 HCI_OP_LE_ADD_TO_RESOLV_LIST = 8231
-HCI_OP_LE_ADD_TO_WHITE_LIST = 8209
+HCI_OP_LE_CLEAR_ACCEPT_LIST = 8208
 HCI_OP_LE_CLEAR_RESOLV_LIST = 8233
-HCI_OP_LE_CLEAR_WHITE_LIST = 8208
 HCI_OP_LE_CONN_PARAM_REQ_NEG_REPLY = 8225
 HCI_OP_LE_CONN_PARAM_REQ_REPLY = 8224
 HCI_OP_LE_CONN_UPDATE = 8211
 HCI_OP_LE_CREATE_CIS = 8292
 HCI_OP_LE_CREATE_CONN = 8205
+HCI_OP_LE_DEL_FROM_ACCEPT_LIST = 8210
 HCI_OP_LE_DEL_FROM_RESOLV_LIST = 8232
-HCI_OP_LE_DEL_FROM_WHITE_LIST = 8210
 HCI_OP_LE_EXT_CREATE_CONN = 8259
 HCI_OP_LE_LTK_NEG_REPLY = 8219
 HCI_OP_LE_LTK_REPLY = 8218
+HCI_OP_LE_READ_ACCEPT_LIST_SIZE = 8207
 HCI_OP_LE_READ_ADV_TX_POWER = 8199
 HCI_OP_LE_READ_BUFFER_SIZE = 8194
 HCI_OP_LE_READ_BUFFER_SIZE_V2 = 8288
@@ -125,7 +126,6 @@ HCI_OP_LE_READ_NUM_SUPPORTED_ADV_SETS = 8251
 HCI_OP_LE_READ_REMOTE_FEATURES = 8214
 HCI_OP_LE_READ_RESOLV_LIST_SIZE = 8234
 HCI_OP_LE_READ_SUPPORTED_STATES = 8220
-HCI_OP_LE_READ_WHITE_LIST_SIZE = 8207
 HCI_OP_LE_REJECT_CIS = 8295
 HCI_OP_LE_REMOVE_CIG = 8293
 HCI_OP_LE_SET_ADDR_RESOLV_ENABLE = 8237
@@ -202,8 +202,8 @@ HCI_OP_RESET = 3075
 HCI_OP_ROLE_DISCOVERY = 2057
 HCI_OP_SETUP_SYNC_CONN = 1064
 HCI_OP_SET_CONN_ENCRYPT = 1043
-HCI_OP_SET_CSB = 1089
-HCI_OP_SET_CSB_DATA = 3190
+HCI_OP_SET_CPB = 1089
+HCI_OP_SET_CPB_DATA = 3190
 HCI_OP_SET_RESERVED_LT_ADDR = 3188
 HCI_OP_SNIFF_MODE = 2051
 HCI_OP_SNIFF_SUBRATE = 2065
diff --git a/sys/linux/socket_netlink_route.txt b/sys/linux/socket_netlink_route.txt
index ba10f22a8..89b178e3f 100644
--- a/sys/linux/socket_netlink_route.txt
+++ b/sys/linux/socket_netlink_route.txt
@@ -29,7 +29,6 @@ include <uapi/linux/ila.h>
 include <uapi/linux/seg6_iptunnel.h>
 include <uapi/linux/seg6_local.h>
 include <uapi/linux/rpl_iptunnel.h>
-include <net/caif/caif_hsi.h>
 
 resource sock_nl_route[sock_netlink]
 type netns_id int32[0:4]
@@ -310,7 +309,6 @@ ifla_info_policy [
 	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]]
-	cfhsi		ifla_info_policy_t["cfhsi", IFLA_INFO_DATA, array[caif_hsi_policy]]
 	geneve		ifla_info_policy_t["geneve", IFLA_INFO_DATA, array[geneve_policy]]
 	wireguard	ifla_info_policy_t["wireguard", IFLA_INFO_DATA, void]
 ] [varlen]
@@ -331,15 +329,6 @@ geneve_policy [
 	IFLA_GENEVE_DF			nlattr[IFLA_GENEVE_DF, int8]
 ] [varlen]
 
-caif_hsi_policy [
-	__IFLA_CAIF_HSI_INACTIVITY_TOUT		nlattr[__IFLA_CAIF_HSI_INACTIVITY_TOUT, int32]
-	__IFLA_CAIF_HSI_AGGREGATION_TOUT	nlattr[__IFLA_CAIF_HSI_AGGREGATION_TOUT, int32]
-	__IFLA_CAIF_HSI_HEAD_ALIGN		nlattr[__IFLA_CAIF_HSI_HEAD_ALIGN, int32]
-	__IFLA_CAIF_HSI_TAIL_ALIGN		nlattr[__IFLA_CAIF_HSI_TAIL_ALIGN, int32]
-	__IFLA_CAIF_HSI_QHIGH_WATERMARK		nlattr[__IFLA_CAIF_HSI_QHIGH_WATERMARK, int32]
-	__IFLA_CAIF_HSI_QLOW_WATERMARK		nlattr[__IFLA_CAIF_HSI_QLOW_WATERMARK, int32]
-] [varlen]
-
 ipoib_policy [
 	IFLA_IPOIB_PKEY		nlattr[IFLA_IPOIB_PKEY, int16]
 	IFLA_IPOIB_MODE		nlattr[IFLA_IPOIB_MODE, bool16]
diff --git a/sys/linux/socket_netlink_route.txt.const b/sys/linux/socket_netlink_route.txt.const
index 605dd5991..983c70847 100644
--- a/sys/linux/socket_netlink_route.txt.const
+++ b/sys/linux/socket_netlink_route.txt.const
@@ -656,11 +656,5 @@ XDP_FLAGS_DRV_MODE = 4
 XDP_FLAGS_HW_MODE = 8
 XDP_FLAGS_SKB_MODE = 2
 XDP_FLAGS_UPDATE_IF_NOEXIST = 1
-__IFLA_CAIF_HSI_AGGREGATION_TOUT = 2
-__IFLA_CAIF_HSI_HEAD_ALIGN = 3
-__IFLA_CAIF_HSI_INACTIVITY_TOUT = 1
-__IFLA_CAIF_HSI_QHIGH_WATERMARK = 5
-__IFLA_CAIF_HSI_QLOW_WATERMARK = 6
-__IFLA_CAIF_HSI_TAIL_ALIGN = 4
 __NR_sendmsg = 211, 386:s390x:370, amd64:46, arm:296, mips64le:5045, ppc64le:341
 __NR_socket = 198, 386:s390x:359, amd64:41, arm:281, mips64le:5040, ppc64le:326