aboutsummaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2021-10-12 19:17:58 +0200
committerDmitry Vyukov <dvyukov@google.com>2021-10-13 08:49:25 +0200
commit9ccfa6cfcceb6981f543e295c1429817ad836a6b (patch)
tree1d094171bfec8f7bc677011705abacdc8311773d /sys
parent8b4549129cf25613dc9f9b349c00cb2b93abfa86 (diff)
sys/linux: regenerate consts, remove ipx
Regenerate const files on the latest upstream tree. Remove IPX support since it was removed from the kernel in 7a2e838d28 ("staging: ipx: delete it from the tree").
Diffstat (limited to 'sys')
-rw-r--r--sys/linux/bpf.txt.const2
-rw-r--r--sys/linux/dev_net_tun.txt1
-rw-r--r--sys/linux/dev_vtpm.txt1
-rw-r--r--sys/linux/dev_vtpm.txt.const2
-rw-r--r--sys/linux/io_uring.txt.const2
-rw-r--r--sys/linux/socket.txt6
-rw-r--r--sys/linux/socket.txt.const2
-rw-r--r--sys/linux/socket_ipx.txt53
-rw-r--r--sys/linux/socket_ipx.txt.const24
-rw-r--r--sys/linux/sys.txt2
-rw-r--r--sys/linux/vnet.txt48
-rw-r--r--sys/linux/vnet.txt.const8
12 files changed, 10 insertions, 141 deletions
diff --git a/sys/linux/bpf.txt.const b/sys/linux/bpf.txt.const
index a740e2c87..069104f75 100644
--- a/sys/linux/bpf.txt.const
+++ b/sys/linux/bpf.txt.const
@@ -243,7 +243,7 @@ BTF_KIND_VOLATILE = 9
BTF_MAGIC = 60319
BTF_VERSION = 1
MAX_BPF_REG = 11
-__BPF_FUNC_MAX_ID = 169
+__BPF_FUNC_MAX_ID = 176
__MAX_BPF_REG = 11
__NR_bpf = 280, 386:357, amd64:321, arm:386, mips64le:5315, ppc64le:361, s390x:351
bpf_call_code = 133
diff --git a/sys/linux/dev_net_tun.txt b/sys/linux/dev_net_tun.txt
index ce6f77fac..09dd55218 100644
--- a/sys/linux/dev_net_tun.txt
+++ b/sys/linux/dev_net_tun.txt
@@ -67,7 +67,6 @@ tun_payload [
ipv6 ipv6_packet
arp arp_packet
llc llc_packet
- ipx ipx_packet
x25 x25_packet
mpls mpls_packet
] [varlen]
diff --git a/sys/linux/dev_vtpm.txt b/sys/linux/dev_vtpm.txt
index 0fd21ce4f..0ca453f7d 100644
--- a/sys/linux/dev_vtpm.txt
+++ b/sys/linux/dev_vtpm.txt
@@ -1,6 +1,7 @@
# Copyright 2021 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.
+include <uapi/linux/fcntl.h>
include <uapi/linux/vtpm_proxy.h>
resource fd_vtpm[fd]
diff --git a/sys/linux/dev_vtpm.txt.const b/sys/linux/dev_vtpm.txt.const
index 837300f3a..dead56fc1 100644
--- a/sys/linux/dev_vtpm.txt.const
+++ b/sys/linux/dev_vtpm.txt.const
@@ -1,5 +1,7 @@
# Code generated by syz-sysgen. DO NOT EDIT.
arches = 386, amd64, arm, arm64, mips64le, ppc64le, riscv64, s390x
+AT_FDCWD = 18446744073709551516
VTPM_PROXY_FLAG_TPM2 = 1
VTPM_PROXY_IOC_NEW_DEV = 3222577408
__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
diff --git a/sys/linux/io_uring.txt.const b/sys/linux/io_uring.txt.const
index 4f7c82c1f..a65ca36fa 100644
--- a/sys/linux/io_uring.txt.const
+++ b/sys/linux/io_uring.txt.const
@@ -26,7 +26,7 @@ IORING_OP_FADVISE = 24
IORING_OP_FALLOCATE = 17
IORING_OP_FILES_UPDATE = 20
IORING_OP_FSYNC = 3
-IORING_OP_LAST = 37
+IORING_OP_LAST = 40
IORING_OP_LINK_TIMEOUT = 15
IORING_OP_MADVISE = 25
IORING_OP_NOP = 0
diff --git a/sys/linux/socket.txt b/sys/linux/socket.txt
index 5bb3a74a1..d8cc2718e 100644
--- a/sys/linux/socket.txt
+++ b/sys/linux/socket.txt
@@ -41,13 +41,13 @@ shutdown(fd sock, how flags[shutdown_flags])
getsockopt(fd sock, level int32, optname int32, optval buffer[out], optlen ptr[inout, len[optval, int32]])
setsockopt(fd sock, level int32, optname int32, optval buffer[in], optlen len[optval])
-socket_domain = AF_UNIX, AF_INET, AF_INET6, AF_IPX, AF_NETLINK, AF_X25, AF_AX25, AF_ATMPVC, AF_APPLETALK, AF_PACKET, AF_VSOCK, AF_XDP, AF_TIPC, AF_RXRPC, AF_PPPOX, AF_RDS, AF_ROSE, AF_PHONET, AF_NFC, AF_NETROM, AF_KEY, AF_KCM, AF_ISDN, AF_SMC, AF_CAN, AF_CAIF, AF_BLUETOOTH, AF_LLC, AF_ALG, AF_QIPCRTR
+socket_domain = AF_UNIX, AF_INET, AF_INET6, AF_NETLINK, AF_X25, AF_AX25, AF_ATMPVC, AF_APPLETALK, AF_PACKET, AF_VSOCK, AF_XDP, AF_TIPC, AF_RXRPC, AF_PPPOX, AF_RDS, AF_ROSE, AF_PHONET, AF_NFC, AF_NETROM, AF_KEY, AF_KCM, AF_ISDN, AF_SMC, AF_CAN, AF_CAIF, AF_BLUETOOTH, AF_LLC, AF_ALG, AF_QIPCRTR
socket_type = SOCK_STREAM, SOCK_DGRAM, SOCK_RAW, SOCK_RDM, SOCK_SEQPACKET, SOCK_DCCP, SOCK_PACKET, SOCK_NONBLOCK, SOCK_CLOEXEC
accept_flags = SOCK_NONBLOCK, SOCK_CLOEXEC
shutdown_flags = SHUT_RD, SHUT_WR
send_flags = MSG_CONFIRM, MSG_DONTROUTE, MSG_DONTWAIT, MSG_EOR, MSG_MORE, MSG_NOSIGNAL, MSG_OOB, MSG_PROBE, MSG_BATCH, MSG_FASTOPEN, MSG_ZEROCOPY
recv_flags = MSG_CMSG_CLOEXEC, MSG_DONTWAIT, MSG_ERRQUEUE, MSG_OOB, MSG_PEEK, MSG_TRUNC, MSG_WAITALL, MSG_WAITFORONE
-cmsg_levels = SOL_SOCKET, IPPROTO_ICMP, SOL_IP, SOL_TCP, SOL_UDP, SOL_IPV6, SOL_ICMPV6, SOL_SCTP, SOL_UDPLITE, SOL_RAW, SOL_IPX, SOL_AX25, SOL_ATALK, SOL_NETROM, SOL_ROSE, SOL_DECNET, SOL_PACKET, SOL_ATM, SOL_AAL, SOL_IRDA, SOL_NETBEUI, SOL_LLC, SOL_DCCP, SOL_NETLINK, SOL_TIPC, SOL_RXRPC, SOL_PPPOL2TP, SOL_BLUETOOTH, SOL_PNPIPE, SOL_RDS, SOL_IUCV, SOL_CAIF, SOL_ALG, SOL_NFC, SOL_KCM
+cmsg_levels = SOL_SOCKET, IPPROTO_ICMP, SOL_IP, SOL_TCP, SOL_UDP, SOL_IPV6, SOL_ICMPV6, SOL_SCTP, SOL_UDPLITE, SOL_RAW, SOL_AX25, SOL_ATALK, SOL_NETROM, SOL_ROSE, SOL_DECNET, SOL_PACKET, SOL_ATM, SOL_AAL, SOL_IRDA, SOL_NETBEUI, SOL_LLC, SOL_DCCP, SOL_NETLINK, SOL_TIPC, SOL_RXRPC, SOL_PPPOL2TP, SOL_BLUETOOTH, SOL_PNPIPE, SOL_RDS, SOL_IUCV, SOL_CAIF, SOL_ALG, SOL_NFC, SOL_KCM
sock_pair {
fd0 sock
@@ -61,7 +61,6 @@ sock_pair {
sockaddr [
in sockaddr_in
ax25 sockaddr_ax25
- ipx sockaddr_ipx
nl sockaddr_nl
llc sockaddr_llc
can sockaddr_can
@@ -87,7 +86,6 @@ sockaddr_storage [
in sockaddr_in
x25 sockaddr_x25
ax25 full_sockaddr_ax25
- ipx sockaddr_ipx
in6 sockaddr_in6
nl sockaddr_nl
ll sockaddr_ll
diff --git a/sys/linux/socket.txt.const b/sys/linux/socket.txt.const
index da8efa338..34403b6f5 100644
--- a/sys/linux/socket.txt.const
+++ b/sys/linux/socket.txt.const
@@ -10,7 +10,6 @@ AF_CAIF = 37
AF_CAN = 29
AF_INET = 2
AF_INET6 = 10
-AF_IPX = 4
AF_ISDN = 34
AF_KCM = 41
AF_KEY = 15
@@ -301,7 +300,6 @@ SOL_DECNET = 261
SOL_ICMPV6 = 58
SOL_IP = 0
SOL_IPV6 = 41
-SOL_IPX = 256
SOL_IRDA = 266
SOL_IUCV = 277
SOL_KCM = 281
diff --git a/sys/linux/socket_ipx.txt b/sys/linux/socket_ipx.txt
deleted file mode 100644
index af15b48e2..000000000
--- a/sys/linux/socket_ipx.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2017 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.
-
-# AF_IPX support.
-
-include <linux/socket.h>
-include <linux/net.h>
-include <linux/if_ether.h>
-include <linux/if_arp.h>
-include <linux/ipx.h>
-
-resource sock_ipx[sock]
-
-socket$ipx(domain const[AF_IPX], type const[SOCK_DGRAM], proto const[0]) sock_ipx
-bind$ipx(fd sock_ipx, addr ptr[in, sockaddr_ipx], addrlen len[addr])
-connect$ipx(fd sock_ipx, addr ptr[in, sockaddr_ipx], addrlen len[addr])
-accept$ipx(fd sock_ipx, peer ptr[out, sockaddr_ipx, opt], peerlen ptr[inout, len[peer, int32]]) sock_ipx
-accept4$ipx(fd sock_ipx, peer ptr[out, sockaddr_ipx, opt], peerlen ptr[inout, len[peer, int32]], flags flags[accept_flags]) sock_ipx
-
-sendto$ipx(fd sock_ipx, buf buffer[in], len len[buf], f flags[send_flags], addr ptr[in, sockaddr_ipx, opt], addrlen len[addr])
-recvfrom$ipx(fd sock_ipx, buf buffer[out], len len[buf], f flags[recv_flags], addr ptr[in, sockaddr_ipx, opt], addrlen len[addr])
-getsockname$ipx(fd sock_ipx, addr ptr[out, sockaddr_ipx], addrlen ptr[inout, len[addr, int32]])
-getpeername$ipx(fd sock_ipx, peer ptr[out, sockaddr_ipx], peerlen ptr[inout, len[peer, int32]])
-
-sockaddr_ipx {
- sipx_family const[AF_IPX, int16]
- sipx_port int16be
- sipx_network int32be
- sipx_node array[int8, 6]
- sipx_type int8
- pad const[0, int8]
-}
-
-# Specific options
-
-getsockopt$ipx_IPX_TYPE(fd sock_ipx, level const[SOL_IPX], optname const[IPX_TYPE], optval ptr[out, int32], optlen ptr[inout, len[optval, int32]])
-setsockopt$ipx_IPX_TYPE(fd sock_ipx, level const[SOL_IPX], optname const[IPX_TYPE], optval ptr[in, int32], optlen len[optval])
-
-# ioctls
-
-# TODO: SIOCDELRT & SIOCADDRT (net/ipx/ipx_route.c)
-
-ioctl$sock_ipx_SIOCSIFADDR(fd sock_ipx, cmd const[SIOCSIFADDR], arg ptr[in, ifreq_t[sockaddr_ipx]])
-ioctl$sock_ipx_SIOCGIFADDR(fd sock_ipx, cmd const[SIOCGIFADDR], arg ptr[inout, ifreq_t[sockaddr_ipx]])
-ioctl$sock_ipx_SIOCAIPXITFCRT(fd sock_ipx, cmd const[SIOCAIPXITFCRT], arg ptr[in, int32])
-ioctl$sock_ipx_SIOCAIPXPRISLT(fd sock_ipx, cmd const[SIOCAIPXPRISLT], arg ptr[in, int32])
-ioctl$sock_ipx_SIOCIPXCFGDATA(fd sock_ipx, cmd const[SIOCIPXCFGDATA], arg ptr[out, ipx_config_data])
-ioctl$sock_ipx_SIOCIPXNCPCONN(fd sock_ipx, cmd const[SIOCIPXNCPCONN], arg ptr[in, int16])
-
-ipx_config_data {
- ipxcfg_auto_select_primary int8
- ipxcfg_auto_create_interfaces int8
-}
diff --git a/sys/linux/socket_ipx.txt.const b/sys/linux/socket_ipx.txt.const
deleted file mode 100644
index bea007bff..000000000
--- a/sys/linux/socket_ipx.txt.const
+++ /dev/null
@@ -1,24 +0,0 @@
-# Code generated by syz-sysgen. DO NOT EDIT.
-arches = 386, amd64, arm, arm64, mips64le, ppc64le, riscv64, s390x
-AF_IPX = 4
-IPX_TYPE = 1
-SIOCAIPXITFCRT = 35296
-SIOCAIPXPRISLT = 35297
-SIOCGIFADDR = 35093
-SIOCIPXCFGDATA = 35298
-SIOCIPXNCPCONN = 35299
-SIOCSIFADDR = 35094
-SOCK_DGRAM = 2, mips64le:1
-SOL_IPX = 256
-__NR_accept = 202, 386:s390x:???, amd64:43, arm:285, mips64le:5042, ppc64le:330
-__NR_accept4 = 242, 386:s390x:364, amd64:288, arm:366, mips64le:5293, ppc64le:344
-__NR_bind = 200, 386:s390x:361, amd64:49, arm:282, mips64le:5048, ppc64le:327
-__NR_connect = 203, 386:s390x:362, amd64:42, arm:283, mips64le:5041, ppc64le:328
-__NR_getpeername = 205, 386:s390x:368, amd64:52, arm:287, mips64le:5051, ppc64le:332
-__NR_getsockname = 204, 386:s390x:367, amd64:51, arm:286, mips64le:5050, ppc64le:331
-__NR_getsockopt = 209, 386:s390x:365, amd64:55, arm:295, mips64le:5054, ppc64le:340
-__NR_ioctl = 54, amd64:16, arm64:riscv64:29, mips64le:5015
-__NR_recvfrom = 207, 386:s390x:371, amd64:45, arm:292, mips64le:5044, ppc64le:337
-__NR_sendto = 206, 386:s390x:369, amd64:44, arm:290, mips64le:5043, ppc64le:335
-__NR_setsockopt = 208, 386:s390x:366, amd64:54, arm:294, mips64le:5053, ppc64le:339
-__NR_socket = 198, 386:s390x:359, amd64:41, arm:281, mips64le:5040, ppc64le:326
diff --git a/sys/linux/sys.txt b/sys/linux/sys.txt
index 6df237ea9..0b8525c18 100644
--- a/sys/linux/sys.txt
+++ b/sys/linux/sys.txt
@@ -517,7 +517,7 @@ syz_open_procfs(pid pid, file ptr[in, string[procfs_proc_file]]) fd
# TODO: some of net files are only available in the init namespace (e.g. bluetooth bnep and hci).
# We could find some way to open these files in the init namespace
# esp. taking into account that we create bluetooth sockets in init namespace.
-procfs_proc_file = "auxv", "cmdline", "environ", "autogroup", "cgroup", "clear_refs", "comm", "coredump_filter", "cpuset", "gid_map", "io", "limits", "loginuid", "maps", "mountinfo", "mounts", "mountstats", "numa_maps", "oom_adj", "oom_score", "oom_score_adj", "pagemap", "personality", "projid_map", "sched", "schedstat", "sessionid", "setgroups", "smaps", "smaps_rollup", "totmaps", "stack", "stat", "statm", "status", "syscall", "timers", "uid_map", "wchan", "map_files", "attr", "attr/current", "attr/exec", "attr/fscreate", "attr/keycreate", "attr/prev", "attr/sockcreate", "ns", "children", "task", "fd", "fd/3", "fd/4", "fdinfo", "fdinfo/3", "fdinfo/4", "net", "net/anycast6", "net/arp", "net/bnep", "net/connector", "net/dev", "net/dev_mcast", "net/dev_snmp6", "net/fib_trie", "net/fib_triestat", "net/hci", "net/icmp", "net/icmp6", "net/if_inet6", "net/igmp", "net/igmp6", "net/ip6_flowlabel", "net/ip6_mr_cache", "net/ip6_mr_vif", "net/ip6_tables_matches", "net/ip6_tables_names", "net/ip6_tables_targets", "net/ip_mr_cache", "net/ip_mr_vif", "net/ip_tables_matches", "net/ip_tables_names", "net/ip_tables_targets", "net/ipv6_route", "net/ipx", "net/l2cap", "net/llc/core", "net/llc/socket", "net/mcfilter", "net/mcfilter6", "net/netfilter", "net/netlink", "net/netstat", "net/nfsfs", "net/packet", "net/protocols", "net/psched", "net/ptype", "net/raw", "net/raw6", "net/rfcomm", "net/route", "net/rpc", "net/rt6_stats", "net/rt_acct", "net/rt_cache", "net/sco", "net/sctp", "net/snmp", "net/snmp6", "net/sockstat", "net/sockstat6", "net/softnet_stat", "net/stat", "net/tcp", "net/tcp6", "net/udp", "net/udp6", "net/udplite", "net/udplite6", "net/unix", "net/wireless", "net/xfrm_stat", "net/ip_vs", "net/ip_vs_stats", "net/ip_vs_stats_percpu", "net/nf_conntrack", "net/nf_conntrack_expect", "net/vlan/config", "net/vlan/vlan0", "net/vlan/vlan1", "net/kcm", "net/psched", "timerslack_ns"
+procfs_proc_file = "auxv", "cmdline", "environ", "autogroup", "cgroup", "clear_refs", "comm", "coredump_filter", "cpuset", "gid_map", "io", "limits", "loginuid", "maps", "mountinfo", "mounts", "mountstats", "numa_maps", "oom_adj", "oom_score", "oom_score_adj", "pagemap", "personality", "projid_map", "sched", "schedstat", "sessionid", "setgroups", "smaps", "smaps_rollup", "totmaps", "stack", "stat", "statm", "status", "syscall", "timers", "uid_map", "wchan", "map_files", "attr", "attr/current", "attr/exec", "attr/fscreate", "attr/keycreate", "attr/prev", "attr/sockcreate", "ns", "children", "task", "fd", "fd/3", "fd/4", "fdinfo", "fdinfo/3", "fdinfo/4", "net", "net/anycast6", "net/arp", "net/bnep", "net/connector", "net/dev", "net/dev_mcast", "net/dev_snmp6", "net/fib_trie", "net/fib_triestat", "net/hci", "net/icmp", "net/icmp6", "net/if_inet6", "net/igmp", "net/igmp6", "net/ip6_flowlabel", "net/ip6_mr_cache", "net/ip6_mr_vif", "net/ip6_tables_matches", "net/ip6_tables_names", "net/ip6_tables_targets", "net/ip_mr_cache", "net/ip_mr_vif", "net/ip_tables_matches", "net/ip_tables_names", "net/ip_tables_targets", "net/ipv6_route", "net/l2cap", "net/llc/core", "net/llc/socket", "net/mcfilter", "net/mcfilter6", "net/netfilter", "net/netlink", "net/netstat", "net/nfsfs", "net/packet", "net/protocols", "net/psched", "net/ptype", "net/raw", "net/raw6", "net/rfcomm", "net/route", "net/rpc", "net/rt6_stats", "net/rt_acct", "net/rt_cache", "net/sco", "net/sctp", "net/snmp", "net/snmp6", "net/sockstat", "net/sockstat6", "net/softnet_stat", "net/stat", "net/tcp", "net/tcp6", "net/udp", "net/udp6", "net/udplite", "net/udplite6", "net/unix", "net/wireless", "net/xfrm_stat", "net/ip_vs", "net/ip_vs_stats", "net/ip_vs_stats_percpu", "net/nf_conntrack", "net/nf_conntrack_expect", "net/vlan/config", "net/vlan/vlan0", "net/vlan/vlan1", "net/kcm", "net/psched", "timerslack_ns"
openat$procfs(fd const[AT_FDCWD], file ptr[in, string[procfs_file]], flags const[O_RDONLY], mode const[0]) fd
diff --git a/sys/linux/vnet.txt b/sys/linux/vnet.txt
index 97b3a82cf..971ad95c2 100644
--- a/sys/linux/vnet.txt
+++ b/sys/linux/vnet.txt
@@ -108,7 +108,7 @@ eth_payload {
# https://en.wikipedia.org/wiki/Ethernet_frame#Ethernet_II
-ether_types = ETH_P_LOOP, ETH_P_PUP, ETH_P_PUPAT, ETH_P_TSN, ETH_P_IP, ETH_P_X25, ETH_P_ARP, ETH_P_IEEEPUP, ETH_P_IEEEPUPAT, ETH_P_BATMAN, ETH_P_DEC, ETH_P_DNA_DL, ETH_P_DNA_RC, ETH_P_DNA_RT, ETH_P_LAT, ETH_P_DIAG, ETH_P_CUST, ETH_P_SCA, ETH_P_TEB, ETH_P_RARP, ETH_P_ATALK, ETH_P_AARP, ETH_P_8021Q, ETH_P_ERSPAN, ETH_P_ERSPAN2, ETH_P_IPX, ETH_P_IPV6, ETH_P_PAUSE, ETH_P_SLOW, ETH_P_WCCP, ETH_P_MPLS_UC, ETH_P_MPLS_MC, ETH_P_ATMMPOA, ETH_P_PPP_DISC, ETH_P_PPP_SES, ETH_P_LINK_CTL, ETH_P_ATMFATE, ETH_P_PAE, ETH_P_AOE, ETH_P_8021AD, ETH_P_802_EX1, ETH_P_TIPC, ETH_P_MACSEC, ETH_P_8021AH, ETH_P_MVRP, ETH_P_1588, ETH_P_NCSI, ETH_P_PRP, ETH_P_FCOE, ETH_P_TDLS, ETH_P_FIP, ETH_P_80221, ETH_P_HSR, ETH_P_LOOPBACK, ETH_P_QINQ1, ETH_P_QINQ2, ETH_P_QINQ3, ETH_P_EDSA, ETH_P_AF_IUCV, ETH_P_802_3_MIN, ETH_P_802_3, ETH_P_AX25, ETH_P_ALL, ETH_P_802_2, ETH_P_SNAP, ETH_P_DDCMP, ETH_P_WAN_PPP, ETH_P_PPP_MP, ETH_P_LOCALTALK, ETH_P_CAN, ETH_P_CANFD, ETH_P_PPPTALK, ETH_P_TR_802_2, ETH_P_MOBITEX, ETH_P_CONTROL, ETH_P_IRDA, ETH_P_ECONET, ETH_P_HDLC, ETH_P_ARCNET, ETH_P_DSA, ETH_P_TRAILER, ETH_P_PHONET, ETH_P_IEEE802154, ETH_P_CAIF, ETH_P_XDSA, ETH_P_MAP
+ether_types = ETH_P_LOOP, ETH_P_PUP, ETH_P_PUPAT, ETH_P_TSN, ETH_P_IP, ETH_P_X25, ETH_P_ARP, ETH_P_IEEEPUP, ETH_P_IEEEPUPAT, ETH_P_BATMAN, ETH_P_DEC, ETH_P_DNA_DL, ETH_P_DNA_RC, ETH_P_DNA_RT, ETH_P_LAT, ETH_P_DIAG, ETH_P_CUST, ETH_P_SCA, ETH_P_TEB, ETH_P_RARP, ETH_P_ATALK, ETH_P_AARP, ETH_P_8021Q, ETH_P_ERSPAN, ETH_P_ERSPAN2, ETH_P_IPV6, ETH_P_PAUSE, ETH_P_SLOW, ETH_P_WCCP, ETH_P_MPLS_UC, ETH_P_MPLS_MC, ETH_P_ATMMPOA, ETH_P_PPP_DISC, ETH_P_PPP_SES, ETH_P_LINK_CTL, ETH_P_ATMFATE, ETH_P_PAE, ETH_P_AOE, ETH_P_8021AD, ETH_P_802_EX1, ETH_P_TIPC, ETH_P_MACSEC, ETH_P_8021AH, ETH_P_MVRP, ETH_P_1588, ETH_P_NCSI, ETH_P_PRP, ETH_P_FCOE, ETH_P_TDLS, ETH_P_FIP, ETH_P_80221, ETH_P_HSR, ETH_P_LOOPBACK, ETH_P_QINQ1, ETH_P_QINQ2, ETH_P_QINQ3, ETH_P_EDSA, ETH_P_AF_IUCV, ETH_P_802_3_MIN, ETH_P_802_3, ETH_P_AX25, ETH_P_ALL, ETH_P_802_2, ETH_P_SNAP, ETH_P_DDCMP, ETH_P_WAN_PPP, ETH_P_PPP_MP, ETH_P_LOCALTALK, ETH_P_CAN, ETH_P_CANFD, ETH_P_PPPTALK, ETH_P_TR_802_2, ETH_P_MOBITEX, ETH_P_CONTROL, ETH_P_IRDA, ETH_P_ECONET, ETH_P_HDLC, ETH_P_ARCNET, ETH_P_DSA, ETH_P_TRAILER, ETH_P_PHONET, ETH_P_IEEE802154, ETH_P_CAIF, ETH_P_XDSA, ETH_P_MAP
eth2_packet [
generic eth2_packet_generic
@@ -117,7 +117,6 @@ eth2_packet [
ipv6 eth2_packet_t[ETH_P_IPV6, ipv6_packet]
llc eth2_packet_t[ETH_P_802_2, llc_packet]
llc_tr eth2_packet_t[ETH_P_TR_802_2, llc_packet]
- ipx eth2_packet_t[ETH_P_IPX, ipx_packet]
x25 eth2_packet_t[ETH_P_X25, x25_packet]
mpls_uc eth2_packet_t[ETH_P_MPLS_UC, mpls_packet]
mpls_mc eth2_packet_t[ETH_P_MPLS_MC, mpls_packet]
@@ -175,7 +174,7 @@ type arp_packet_t[HTYPE, PTYPE, ADDR] {
include <uapi/linux/llc.h>
# Adding '1' as a SAP value since the lower bit in SAP has a special meaning.
-sap_values = 1, LLC_SAP_NULL, LLC_SAP_LLC, LLC_SAP_SNA, LLC_SAP_PNM, LLC_SAP_IP, LLC_SAP_BSPAN, LLC_SAP_MMS, LLC_SAP_8208, LLC_SAP_3COM, LLC_SAP_PRO, LLC_SAP_SNAP, LLC_SAP_BANYAN, LLC_SAP_IPX, LLC_SAP_NETBEUI, LLC_SAP_LANMGR, LLC_SAP_IMPL, LLC_SAP_DISC, LLC_SAP_OSI, LLC_SAP_LAR, LLC_SAP_RM, LLC_SAP_GLOBAL
+sap_values = 1, LLC_SAP_NULL, LLC_SAP_LLC, LLC_SAP_SNA, LLC_SAP_PNM, LLC_SAP_IP, LLC_SAP_BSPAN, LLC_SAP_MMS, LLC_SAP_8208, LLC_SAP_3COM, LLC_SAP_PRO, LLC_SAP_SNAP, LLC_SAP_BANYAN, LLC_SAP_NETBEUI, LLC_SAP_LANMGR, LLC_SAP_IMPL, LLC_SAP_DISC, LLC_SAP_OSI, LLC_SAP_LAR, LLC_SAP_RM, LLC_SAP_GLOBAL
llc_generic_packet {
dsap flags[sap_values, int8]
@@ -207,49 +206,6 @@ llc_packet {
} [packed]
################################################################################
-###################################### IPX #####################################
-################################################################################
-
-# http://www.networksorcery.com/enp/protocol/ipx.htm
-# https://en.wikipedia.org/wiki/Internetwork_Packet_Exchange#IPX_packet_structure
-
-include <net/ipx.h>
-
-ipx_network [
- random int32be
- current const[0x0, int32be]
- broadcast const[0xffffffff, int32be]
-]
-
-ipx_node [
- random array[int8, 6]
- current array[const[0x0, int8], 6]
- broadcast array[const[0xff, int8], 6]
-]
-
-ipx_addr {
- network ipx_network
- node ipx_node
- socket int16be
-} [packed]
-
-ipx_packet_types = IPX_TYPE_UNKNOWN, IPX_TYPE_RIP, IPX_TYPE_SAP, IPX_TYPE_SPX, IPX_TYPE_NCP, IPX_TYPE_PPROP
-
-ipx_packet {
- csum const[0xffff, int16be]
- length len[parent, int16be]
- control int8
- type flags[ipx_packet_types, int8]
- dst_addr ipx_addr
- src_addr ipx_addr
- payload array[int8]
-} [packed]
-
-# TODO: setup ipx on virtual interfaces in executor
-# TODO: describe particular ipx types
-# TODO: open ipx sockets from userspace
-
-################################################################################
###################################### x25 #####################################
################################################################################
diff --git a/sys/linux/vnet.txt.const b/sys/linux/vnet.txt.const
index 9baba0f61..0f5497531 100644
--- a/sys/linux/vnet.txt.const
+++ b/sys/linux/vnet.txt.const
@@ -135,7 +135,6 @@ ETH_P_IEEEPUP = 2560
ETH_P_IEEEPUPAT = 2561
ETH_P_IP = 2048
ETH_P_IPV6 = 34525
-ETH_P_IPX = 33079
ETH_P_IRDA = 23
ETH_P_LAT = 24580
ETH_P_LINK_CTL = 34924
@@ -304,12 +303,6 @@ IPV6_TLV_PAD1 = 0
IPV6_TLV_PADN = 1
IPV6_TLV_ROUTERALERT = 5
IPV6_TLV_TNL_ENCAP_LIMIT = 4
-IPX_TYPE_NCP = 17
-IPX_TYPE_PPROP = 20
-IPX_TYPE_RIP = 1
-IPX_TYPE_SAP = 4
-IPX_TYPE_SPX = 5
-IPX_TYPE_UNKNOWN = 0
LLC_SAP_3COM = 128
LLC_SAP_8208 = 126
LLC_SAP_BANYAN = 188
@@ -318,7 +311,6 @@ LLC_SAP_DISC = 252
LLC_SAP_GLOBAL = 255
LLC_SAP_IMPL = 248
LLC_SAP_IP = 6
-LLC_SAP_IPX = 224
LLC_SAP_LANMGR = 244
LLC_SAP_LAR = 220
LLC_SAP_LLC = 2