From 4e92b52605a860674b3e99f9c6194601dd67cb23 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Thu, 11 Feb 2021 08:00:00 +0000 Subject: rtnl_route: switch to use bundled * src/types/rtnl_route.h: Remove. * bundled/linux/include/uapi/linux/rtnetlink.h: New file, copied from headers_install'ed Linux kernel v5.11-rc6. * bundled/Makefile.am (EXTRA_DIST): Add it. * src/rtnl_route.c: Include instead of "types/rtnl_route.h". (decode_rta_mfc_stats): Replace struct_rta_mfc_stats with struct rta_mfc_stats. (decode_rtvia): Replace struct_rtvia with struct rtvia. * src/xlat/nl_route_types.in: Add #unconditional, remove fallback definitions. * src/xlat/route_nexthop_flags.in: Likewise. * src/xlat/routing_flags.in: Likewise. * src/xlat/routing_protocols.in: Likewise. * src/xlat/routing_scopes.in: Likewise. * src/xlat/routing_table_ids.in: Likewise. * src/xlat/routing_types.in: Likewise. * src/xlat/rtnl_route_attrs.in: Likewise. * src/xlat/rtnl_rta_metrics_attrs.in: Likewise. * src/xlat/rtnl_tc_attrs.in: Likewise. * tests/netlink_route.c: Assume RTM_NEWNSID is available. * tests/nlattr_rtgenmsg.c: Assume RTM_GETNSID is available. * tests/nlattr_rtmsg.c: Assume RTA_ENCAP_TYPE, struct rta_mfc_stats, and struct rtvia are available. * tests/nlattr_tca_stab.c: Assume TCA_STAB is available. --- src/xlat/rtnl_tc_attrs.in | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'src/xlat/rtnl_tc_attrs.in') diff --git a/src/xlat/rtnl_tc_attrs.in b/src/xlat/rtnl_tc_attrs.in index d822920c1..fba3d0a61 100644 --- a/src/xlat/rtnl_tc_attrs.in +++ b/src/xlat/rtnl_tc_attrs.in @@ -1,17 +1,18 @@ +#unconditional #value_indexed -TCA_UNSPEC 0 -TCA_KIND 1 -TCA_OPTIONS 2 -TCA_STATS 3 -TCA_XSTATS 4 -TCA_RATE 5 -TCA_FCNT 6 -TCA_STATS2 7 -TCA_STAB 8 -TCA_PAD 9 -TCA_DUMP_INVISIBLE 10 -TCA_CHAIN 11 -TCA_HW_OFFLOAD 12 -TCA_INGRESS_BLOCK 13 -TCA_EGRESS_BLOCK 14 -TCA_DUMP_FLAGS 15 +TCA_UNSPEC +TCA_KIND +TCA_OPTIONS +TCA_STATS +TCA_XSTATS +TCA_RATE +TCA_FCNT +TCA_STATS2 +TCA_STAB +TCA_PAD +TCA_DUMP_INVISIBLE +TCA_CHAIN +TCA_HW_OFFLOAD +TCA_INGRESS_BLOCK +TCA_EGRESS_BLOCK +TCA_DUMP_FLAGS -- cgit v1.2.1