861f9fd7d8
Rename struct xlat to struct xlat_data and make struct xlat an xlat descriptor that contains various information about xlat. So far, it's type and number of items. As a result, xlookup/printxval now have enought information for handling xlat depending on its type, so no *index/*_search APIs are needed. * xlat.h (struct xlat_data): Rename from struct xlat. (struct xlat): New type definition. * xlat.c (xlat_search, printxval_sized, printxval_searchn_ex, xlat_idx, printxval_indexn_ex, printxval_dispatch_ex, ): Remove. (xlookup): Handle xlat_data based on xlat type. (xlookup_le): New function, replaces xlat_search_eq_or_less and supports all xlat types. (sprintflags_ex, printflags_ex): Update. * xlat/gen.sh (gen_header): Add handling for #sorted, generate new struct xlat descriptor. * defs.h (arp_hardware_types_size, ethernet_protocols_size, inet_protocols_size, evdev_abs_size, xlat_search, xlat_search_eq_or_less, xlat_idx, printxval_searchn_ex, printxval_searchn, printxval_search, printxval_search_ex, printxval_indexn_ex, printxval_indexn, printxval_index, printxval_index_ex, printxval_dispatch_ex, printxval_dispatch): Remove. (enum xlat_style_private_flag_bits): Remove PAF_INDEX_XLAT_SORTED_BIT and PAF_INDEX_XLAT_VALUE_INDEXED_BIT. (enum xlat_style_private_flag): Remove PAF_INDEX_XLAT_SORTED and PAF_INDEX_XLAT_VALUE_INDEXED. (print_array_ex): Remove index_xlat_size argument. (xlookup_le): New declaration. (printxval_ex): New macro. * dyxlat.c (struct dyxlat): Remove used field (use xlat.size instead), embed struct xlat, add pointer to struct xlat_data. (MARK_END): Remove. (dyxlat_alloc, dyxlat_free, dyxlat_get, dyxlat_add_pair): Update in accordance with the structure changes. * evdev.c (evdev_abs_size): Remove. (keycode_ioctl): Use printxval instead of printxval_index. (decode_bitset): Remove. (decode_bitset_): Rename to decode_bitset, remove decode_nr_size and xt arguments, call printxval instead of printxval_dispatch. (bit_ioctl, evdev_read_ioctl): Do not pass xlat type to decode_bitset. * print_fields.h (PRINT_FIELD_XVAL_SORTED_SIZED, PRINT_FIELD_XVAL_INDEX): Remove. * nlattr.h (struct decode_nla_xlat_opts): Remove xlat_size and xt fields. * nlattr.c (decode_nla_meminfo): do not pass PAF_INDEX_XLAT_VALUE_INDEXED flag and netlink_sk_meminfo_indices size in a print_array_ex call. (decode_nla_xval): Call printxval_ex instead of printxval_dispatch_ex. (decode_nla_ether_proto, decode_nla_ip_proto): Do not pass xlat_size and xt fields in opts. (decode_nla_flags): Remove XT_INDEXED unsupported warning. * process.c (struct_user_offsets_data): Rename from struct_user_offsets, change type to struct xlat_data[], remove XLAT_END. (struct_user_offsets): New xlat description. (print_user_offset_addr): Rewrite using xlookup_le. * util.c (print_array_ex): Remove index_xlat_size argument, simply call printxval_ex for index printing. * aio.c (tprint_lio_opcode): Use printxval_ex instead of printxval_indexn_ex. * bpf.c: Use printxval instead of printxval_index; use PRINT_FIELD_XVAL instead of PRINT_FIELD_XVAL_INDEX. * bpf_filter.c (print_bpf_filter_code): Use printxval instead of printxval_index. * ioctl.c (evdev_decode_number): Use printxval instead of printxval_indexn. * kvm.c (kvm_ioctl_decode_check_extension): Use printxval instead of printxval_index. (kvm_ioctl_run_attach_auxstr): Use xlookup instead of xlat_idx. * net.c: Use printxval instead of printxval_search/printxval_index, use printxval_ex instead of printxval_searchn_ex. * netlink_packet_diag.c (decode_packet_diag_msg): Use PRINT_FIELD_XVAL instead of PRINT_FIELD_XVAL_SORTED_SIZED. * netlink_smc_diag.c (decode_smc_diag_shutdown): Remove ARRSZ_PAIR wrapper. (decode_smc_diag_fallback): Use printxval_ex instead of printxval_search_ex. (decode_smc_diag_msg): Use PRINT_FIELD_XVAL instead of PRINT_FIELD_XVAL_INDEX. * print_statfs.c (print_statfs_type): Use printxval instead of printxval_search. * rtnl_cachereport.c (decode_nla_ipmra_msg_type, decode_nla_ip6mra_msg_type): Remove ARRSZ_PAIR wrappers, xt fields. * rtnl_link.c (decode_ifla_inet6_flags, decode_ifla_inet6_agm): Likewise. (decode_nla_tun_type, decode_ifla_xdp_attached): Remove xlat_size, xt fields. (decode_ifla_inet_conf, decode_ifla_inet6_conf, decode_ifla_inet6_stats, decode_ifla_inet6_icmp6_stats): Remove PAF_INDEX_XLAT_VALUE_INDEXED flag and ARRSZ_PAIR wrapper in print_array_ex calls. (decode_ifinfomsg): Use PRINT_FIELD_XVAL instead of PRINT_FIELD_XVAL_SORTED_SIZED. * rtnl_route.c (decode_nla_rt_proto): Use printxval instead of printxval_search. * sock.c (print_ifreq): Use PRINT_FIELD_XVAL instead of PRINT_FIELD_XVAL_SORTED_SIZED. * sockaddr.c (print_sockaddr_data_ll, print_sockaddr_data_bt, print_sockaddr): Use printxval instead of printxval_search and printxval_index. * time.c (getitimer, osf_getitimer, setitimer, printclockname): Use printxval instead of printxval_index. (do_adjtimex): Use xlookup instead of xlat_idx. * v4l2.c (print_v4l2_cid): Use xlookup instead of xlat_search. (print_v4l2_cid): Use xlookup_le instead of xlat_search_eq_or_less. * tests/btrfs.c: Update xlat handling, use struct xlat_data instead of struct xlat for XLAT() arrays. * tests/ioctl_block.c: Likewise. * tests/ioctl_rtc.c: Likewise. * tests/printflags.c: Likewise. * tests/printxval.c: Likewise. * tests/prlimit64.c: Likewise. * tests/setrlimit.c: Likewise. * tests/socketcall.c: Likewise. * tests/xgetrlimit.c: Likewise. * tests/xstatfsx.c: Likewise. * xlat/af_packet_versions.in: Add #value_indexed. * xlat/arp_hardware_types.in: Add #sorted. * xlat/ax25_protocols.in: Likewise. * xlat/bluetooth_l2_cid.in: Likewise. * xlat/bluetooth_l2_psm.in: Likewise. * xlat/ethernet_protocols.in: Likewise. * xlat/evdev_ff_types.in: Likewise. * xlat/fsmagic.in: Likewise. * xlat/hw_breakpoint_type.in: Likewise. * xlat/iffflags.in: Likewise. * xlat/inet6_if_flags.in: Likewise. * xlat/inet_protocols.in: Likewise. * xlat/msgctl_flags.in: Likewise. * xlat/perf_hw_cache_id.in: Likewise. * xlat/perf_hw_cache_op_id.in: Likewise. * xlat/perf_hw_cache_op_result_id.in: Likewise. * xlat/perf_hw_id.in: Likewise. * xlat/perf_sw_ids.in: Likewise. * xlat/perf_type_id.in: Likewise. * xlat/routing_protocols.in: Likewise. * xlat/semctl_flags.in: Likewise. * xlat/shmctl_flags.in: Likewise. * xlat/smc_decl_codes.in: Likewise. * xlat/sock_ax25_options.in: Likewise. * xlat/sock_bluetooth_options.in: Likewise. * xlat/sock_dccp_options.in: Likewise. * xlat/sock_tipc_options.in: Likewise. * xlat/socketlayers.in: Likewise. * xlat/v4l2_control_classes.in: Likewise. * xlat/v4l2_pix_fmts.in: Likewise. * xlat/v4l2_sdr_fmts.in: Likewise.
93 lines
5.0 KiB
Plaintext
93 lines
5.0 KiB
Plaintext
#sorted sort -k2,2
|
|
ETH_P_802_3 0x0001 /* Dummy type for 802.3 frames */
|
|
ETH_P_AX25 0x0002 /* Dummy protocol id for AX.25 */
|
|
ETH_P_ALL 0x0003 /* Every packet (be careful!!!) */
|
|
ETH_P_802_2 0x0004 /* 802.2 frames */
|
|
ETH_P_SNAP 0x0005 /* Internal only */
|
|
ETH_P_DDCMP 0x0006 /* DEC DDCMP: Internal only */
|
|
ETH_P_WAN_PPP 0x0007 /* Dummy type for WAN PPP frames*/
|
|
ETH_P_PPP_MP 0x0008 /* Dummy type for PPP MP frames */
|
|
ETH_P_LOCALTALK 0x0009 /* Localtalk pseudo type */
|
|
ETH_P_CAN 0x000C /* CAN: Controller Area Network */
|
|
ETH_P_CANFD 0x000D /* CANFD: CAN flexible data rate*/
|
|
ETH_P_PPPTALK 0x0010 /* Dummy type for Atalk over PPP*/
|
|
ETH_P_TR_802_2 0x0011 /* 802.2 frames */
|
|
ETH_P_MOBITEX 0x0015 /* Mobitex (kaz@cafe.net) */
|
|
ETH_P_CONTROL 0x0016 /* Card specific control frames */
|
|
ETH_P_IRDA 0x0017 /* Linux-IrDA */
|
|
ETH_P_ECONET 0x0018 /* Acorn Econet */
|
|
ETH_P_HDLC 0x0019 /* HDLC frames */
|
|
ETH_P_ARCNET 0x001A /* 1A for ArcNet :-) */
|
|
ETH_P_DSA 0x001B /* Distributed Switch Arch. */
|
|
ETH_P_TRAILER 0x001C /* Trailer switch tagging */
|
|
ETH_P_LOOP 0x0060 /* Ethernet Loopback packet */
|
|
ETH_P_PHONET 0x00F5 /* Nokia Phonet frames */
|
|
ETH_P_IEEE802154 0x00F6 /* IEEE802.15.4 frame */
|
|
ETH_P_CAIF 0x00F7 /* ST-Ericsson CAIF protocol */
|
|
ETH_P_XDSA 0x00F8 /* Multiplexed DSA protocol */
|
|
ETH_P_MAP 0x00F9 /* Qualcomm multiplexing and aggregation protocol */
|
|
ETH_P_PUP 0x0200 /* Xerox PUP packet */
|
|
ETH_P_PUPAT 0x0201 /* Xerox PUP Addr Trans packet */
|
|
ETH_P_802_3_MIN 0x0600 /* If the value in the ethernet type is less than this value then the frame is Ethernet II. Else it is 802.3 */
|
|
ETH_P_IP 0x0800 /* Internet Protocol packet */
|
|
ETH_P_X25 0x0805 /* CCITT X.25 */
|
|
ETH_P_ARP 0x0806 /* Address Resolution packet */
|
|
ETH_P_BPQ 0x08FF /* G8BPQ AX.25 Ethernet Packet [ NOT AN OFFICIALLY REGISTERED ID ] */
|
|
ETH_P_IEEEPUP 0x0a00 /* Xerox IEEE802.3 PUP packet */
|
|
ETH_P_IEEEPUPAT 0x0a01 /* Xerox IEEE802.3 PUP Addr Trans packet */
|
|
ETH_P_ERSPAN2 0x22EB /* ERSPAN version 2 (type III) */
|
|
ETH_P_TSN 0x22F0 /* TSN (IEEE 1722) packet */
|
|
ETH_P_BATMAN 0x4305 /* B.A.T.M.A.N.-Advanced packet [ NOT AN OFFICIALLY REGISTERED ID ] */
|
|
ETH_P_DEC 0x6000 /* DEC Assigned proto */
|
|
ETH_P_DNA_DL 0x6001 /* DEC DNA Dump/Load */
|
|
ETH_P_DNA_RC 0x6002 /* DEC DNA Remote Console */
|
|
ETH_P_DNA_RT 0x6003 /* DEC DNA Routing */
|
|
ETH_P_LAT 0x6004 /* DEC LAT */
|
|
ETH_P_DIAG 0x6005 /* DEC Diagnostics */
|
|
ETH_P_CUST 0x6006 /* DEC Customer use */
|
|
ETH_P_SCA 0x6007 /* DEC Systems Comms Arch */
|
|
ETH_P_TEB 0x6558 /* Trans Ether Bridging */
|
|
ETH_P_RARP 0x8035 /* Reverse Addr Res packet */
|
|
ETH_P_ATALK 0x809B /* Appletalk DDP */
|
|
ETH_P_AARP 0x80F3 /* Appletalk AARP */
|
|
ETH_P_8021Q 0x8100 /* 802.1Q VLAN Extended Header */
|
|
ETH_P_IPX 0x8137 /* IPX over DIX */
|
|
ETH_P_IPV6 0x86DD /* IPv6 over bluebook */
|
|
ETH_P_PAUSE 0x8808 /* IEEE Pause frames. See 802.3 31B */
|
|
ETH_P_SLOW 0x8809 /* Slow Protocol. See 802.3ad 43B */
|
|
ETH_P_WCCP 0x883E /* Web-cache coordination protocol */
|
|
ETH_P_MPLS_UC 0x8847 /* MPLS Unicast traffic */
|
|
ETH_P_MPLS_MC 0x8848 /* MPLS Multicast traffic */
|
|
ETH_P_ATMMPOA 0x884c /* MultiProtocol Over ATM */
|
|
ETH_P_PPP_DISC 0x8863 /* PPPoE discovery messages */
|
|
ETH_P_PPP_SES 0x8864 /* PPPoE session messages */
|
|
ETH_P_LINK_CTL 0x886c /* HPNA, wlan link local tunnel */
|
|
ETH_P_ATMFATE 0x8884 /* Frame-based ATM Transport over Ethernet */
|
|
ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */
|
|
ETH_P_AOE 0x88A2 /* ATA over Ethernet */
|
|
ETH_P_8021AD 0x88A8 /* 802.1ad Service VLAN */
|
|
ETH_P_802_EX1 0x88B5 /* 802.1 Local Experimental 1. */
|
|
ETH_P_ERSPAN 0x88BE /* ERSPAN type II */
|
|
ETH_P_PREAUTH 0x88C7 /* 802.11 Preauthentication */
|
|
ETH_P_TIPC 0x88CA /* TIPC */
|
|
ETH_P_MACSEC 0x88E5 /* 802.1ae MACsec */
|
|
ETH_P_8021AH 0x88E7 /* 802.1ah Backbone Service Tag */
|
|
ETH_P_MVRP 0x88F5 /* 802.1Q MVRP */
|
|
ETH_P_1588 0x88F7 /* IEEE 1588 Timesync */
|
|
ETH_P_NCSI 0x88F8 /* NCSI protocol */
|
|
ETH_P_PRP 0x88FB /* IEC 62439-3 PRP/HSRv0 */
|
|
ETH_P_FCOE 0x8906 /* Fibre Channel over Ethernet */
|
|
ETH_P_TDLS 0x890D /* TDLS */
|
|
ETH_P_FIP 0x8914 /* FCoE Initialization Protocol */
|
|
ETH_P_IBOE 0x8915 /* Infiniband over Ethernet */
|
|
ETH_P_80221 0x8917 /* IEEE 802.21 Media Independent Handover Protocol */
|
|
ETH_P_HSR 0x892F /* IEC 62439-3 HSRv1 */
|
|
ETH_P_NSH 0x894F /* Network Service Header */
|
|
ETH_P_LOOPBACK 0x9000 /* Ethernet loopback packet, per IEEE 802.3 */
|
|
ETH_P_QINQ1 0x9100 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
|
|
ETH_P_QINQ2 0x9200 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
|
|
ETH_P_QINQ3 0x9300 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
|
|
ETH_P_EDSA 0xDADA /* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */
|
|
ETH_P_IFE 0xED3E /* ForCES inter-FE LFB type */
|
|
ETH_P_AF_IUCV 0xFBFB /* IBM af_iucv [ NOT AN OFFICIALLY REGISTERED ID ] */
|