tools headers uapi: Update tools's copy of linux/if_link.h
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 5db48a8d01319620d390bf6d9da5410be14f98e3 Gitweb: https://git.kernel.org/tip/5db48a8d01319620d390bf6d9da5410be14f98e3 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Tue, 11 Sep 2018 14:10:52 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 11 Sep 2018 14:10:52 -0300
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 <[email protected]>
Cc Daniel Borkmann <[email protected]>
Cc David Ahern <[email protected]>
Cc David S. Miller <[email protected]>
Cc Jakub Kicinski <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Nikolay Aleksandrov <[email protected]>
Cc Steffen Klassert <[email protected]>
Cc Stephen Hemminger <[email protected]>
Cc Wang Nan <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/include/uapi/linux/if_link.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
tools/include/uapi/linux/if_link.h +17 -0
@@ -164,6 +164,8 @@ enum {IFLA_CARRIER_UP_COUNT ,IFLA_CARRIER_DOWN_COUNT ,IFLA_NEW_IFINDEX , +IFLA_MIN_MTU , +IFLA_MAX_MTU , __IFLA_MAX };
@@ -334,6 +336,7 @@ enum {IFLA_BRPORT_GROUP_FWD_MASK ,IFLA_BRPORT_NEIGH_SUPPRESS ,IFLA_BRPORT_ISOLATED , +IFLA_BRPORT_BACKUP_PORT , __IFLA_BRPORT_MAX };#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
@@ -459,6 +462,16 @@ enum {#define IFLA_MACSEC_MAX (__IFLA_MACSEC_MAX - 1) +/* XFRM section */ +enum { +IFLA_XFRM_UNSPEC , +IFLA_XFRM_LINK , +IFLA_XFRM_IF_ID , + __IFLA_XFRM_MAX +}; + +#define IFLA_XFRM_MAX (__IFLA_XFRM_MAX - 1) +enum macsec_validation_type {MACSEC_VALIDATE_DISABLED =0 ,MACSEC_VALIDATE_CHECK =1 ,
@@ -920,6 +933,7 @@ enum {XDP_ATTACHED_DRV ,XDP_ATTACHED_SKB ,XDP_ATTACHED_HW , + XDP_ATTACHED_MULTI, }; enum {
@@ -928,6 +942,9 @@ enum {IFLA_XDP_ATTACHED ,IFLA_XDP_FLAGS ,IFLA_XDP_PROG_ID , +IFLA_XDP_DRV_PROG_ID , +IFLA_XDP_SKB_PROG_ID , +IFLA_XDP_HW_PROG_ID , __IFLA_XDP_MAX, };