tools include uapi: Sync linux/if_link.h copy with the kernel sources
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 498c203d855eaf6571b63ea860a53862c4fe91b7 Gitweb: https://git.kernel.org/tip/498c203d855eaf6571b63ea860a53862c4fe91b7 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Wed, 9 Jan 2019 10:02:12 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 9 Jan 2019 10:02:12 -0300
tools include uapi: Sync linux/if_link.h copy with the kernel sources
To pick the changes from:
a428afe82f98 ("net: bridge: add support for user-controlled bool options") a025fb5f49ad ("geneve: Allow configuration of DF behaviour") b4d3069783bc ("vxlan: Allow configuration of DF behaviour")
Silencing this tools/ 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 David S. Miller <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Nikolay Aleksandrov <[email protected]>
Cc Stefano Brivio <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/include/uapi/linux/if_link.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
tools/include/uapi/linux/if_link.h +19 -0
@@ -288,6 +288,7 @@ enum {IFLA_BR_MCAST_IGMP_VERSION ,IFLA_BR_MCAST_MLD_VERSION ,IFLA_BR_VLAN_STATS_PER_PORT , +IFLA_BR_MULTI_BOOLOPT , __IFLA_BR_MAX, };
@@ -533,6 +534,7 @@ enum {IFLA_VXLAN_LABEL ,IFLA_VXLAN_GPE ,IFLA_VXLAN_TTL_INHERIT , +IFLA_VXLAN_DF , __IFLA_VXLAN_MAX };#define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1)
@@ -542,6 +544,14 @@ struct ifla_vxlan_port_range {__be16 high; }; +enum ifla_vxlan_df { +VXLAN_DF_UNSET =0 , +VXLAN_DF_SET , +VXLAN_DF_INHERIT , + __VXLAN_DF_END, +VXLAN_DF_MAX = __VXLAN_DF_END -1 , +}; +/* GENEVE section */ enum {IFLA_GENEVE_UNSPEC ,
@@ -557,10 +567,19 @@ enum {IFLA_GENEVE_UDP_ZERO_CSUM6_RX ,IFLA_GENEVE_LABEL ,IFLA_GENEVE_TTL_INHERIT , +IFLA_GENEVE_DF , __IFLA_GENEVE_MAX };#define IFLA_GENEVE_MAX (__IFLA_GENEVE_MAX - 1) +enum ifla_geneve_df { +GENEVE_DF_UNSET =0 , +GENEVE_DF_SET , +GENEVE_DF_INHERIT , + __GENEVE_DF_END, +GENEVE_DF_MAX = __GENEVE_DF_END -1 , +}; +/* PPP section */ enum { IFLA_PPP_UNSPEC,