diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-09-11 13:10:52 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-09-11 13:10:52 -0400 |
commit | 5db48a8d01319620d390bf6d9da5410be14f98e3 (patch) | |
tree | 184e25416b3e082f23e1f572b52166a992071e2c /tools | |
parent | 7f28785c41f4d5635e69c183b3de8ea19093ccef (diff) |
tools headers uapi: Update tools's copy of linux/if_link.h
To get the changes in:
3e7a50ceb11e ("net: report min and max mtu network device settings")
2756f68c3149 ("net: bridge: add support for backup port")
a25717d2b604 ("xdp: support simultaneous driver and hw XDP attachment")
4f91da26c811 ("xdp: add per mode attributes for attached programs")
f203b76d7809 ("xfrm: Add virtual xfrm interfaces")
Silencing this libbpf build warning:
Warning: Kernel ABI header at 'tools/include/uapi/linux/if_link.h' differs from latest version at 'include/uapi/linux/if_link.h'
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: David Ahern <dsahern@gmail.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Jakub Kicinski <jakub.kicinski@netronome.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: Stephen Hemminger <stephen@networkplumber.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-xd9ztioa894zemv8ag8kg64u@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/include/uapi/linux/if_link.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/tools/include/uapi/linux/if_link.h b/tools/include/uapi/linux/if_link.h index cf01b6824244..43391e2d1153 100644 --- a/tools/include/uapi/linux/if_link.h +++ b/tools/include/uapi/linux/if_link.h | |||
@@ -164,6 +164,8 @@ enum { | |||
164 | IFLA_CARRIER_UP_COUNT, | 164 | IFLA_CARRIER_UP_COUNT, |
165 | IFLA_CARRIER_DOWN_COUNT, | 165 | IFLA_CARRIER_DOWN_COUNT, |
166 | IFLA_NEW_IFINDEX, | 166 | IFLA_NEW_IFINDEX, |
167 | IFLA_MIN_MTU, | ||
168 | IFLA_MAX_MTU, | ||
167 | __IFLA_MAX | 169 | __IFLA_MAX |
168 | }; | 170 | }; |
169 | 171 | ||
@@ -334,6 +336,7 @@ enum { | |||
334 | IFLA_BRPORT_GROUP_FWD_MASK, | 336 | IFLA_BRPORT_GROUP_FWD_MASK, |
335 | IFLA_BRPORT_NEIGH_SUPPRESS, | 337 | IFLA_BRPORT_NEIGH_SUPPRESS, |
336 | IFLA_BRPORT_ISOLATED, | 338 | IFLA_BRPORT_ISOLATED, |
339 | IFLA_BRPORT_BACKUP_PORT, | ||
337 | __IFLA_BRPORT_MAX | 340 | __IFLA_BRPORT_MAX |
338 | }; | 341 | }; |
339 | #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1) | 342 | #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1) |
@@ -459,6 +462,16 @@ enum { | |||
459 | 462 | ||
460 | #define IFLA_MACSEC_MAX (__IFLA_MACSEC_MAX - 1) | 463 | #define IFLA_MACSEC_MAX (__IFLA_MACSEC_MAX - 1) |
461 | 464 | ||
465 | /* XFRM section */ | ||
466 | enum { | ||
467 | IFLA_XFRM_UNSPEC, | ||
468 | IFLA_XFRM_LINK, | ||
469 | IFLA_XFRM_IF_ID, | ||
470 | __IFLA_XFRM_MAX | ||
471 | }; | ||
472 | |||
473 | #define IFLA_XFRM_MAX (__IFLA_XFRM_MAX - 1) | ||
474 | |||
462 | enum macsec_validation_type { | 475 | enum macsec_validation_type { |
463 | MACSEC_VALIDATE_DISABLED = 0, | 476 | MACSEC_VALIDATE_DISABLED = 0, |
464 | MACSEC_VALIDATE_CHECK = 1, | 477 | MACSEC_VALIDATE_CHECK = 1, |
@@ -920,6 +933,7 @@ enum { | |||
920 | XDP_ATTACHED_DRV, | 933 | XDP_ATTACHED_DRV, |
921 | XDP_ATTACHED_SKB, | 934 | XDP_ATTACHED_SKB, |
922 | XDP_ATTACHED_HW, | 935 | XDP_ATTACHED_HW, |
936 | XDP_ATTACHED_MULTI, | ||
923 | }; | 937 | }; |
924 | 938 | ||
925 | enum { | 939 | enum { |
@@ -928,6 +942,9 @@ enum { | |||
928 | IFLA_XDP_ATTACHED, | 942 | IFLA_XDP_ATTACHED, |
929 | IFLA_XDP_FLAGS, | 943 | IFLA_XDP_FLAGS, |
930 | IFLA_XDP_PROG_ID, | 944 | IFLA_XDP_PROG_ID, |
945 | IFLA_XDP_DRV_PROG_ID, | ||
946 | IFLA_XDP_SKB_PROG_ID, | ||
947 | IFLA_XDP_HW_PROG_ID, | ||
931 | __IFLA_XDP_MAX, | 948 | __IFLA_XDP_MAX, |
932 | }; | 949 | }; |
933 | 950 | ||