tools include uapi: Sync linux/if_link.h copy with the kernel sources (498c203d) · Commits · 戴 / test

To pick the changes from: ("net: bridge: add support for user-controlled bool options") ("geneve: Allow configuration of DF behaviour") ("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 <adrian.hunter@intel.com> Cc: David S. Miller <davem@davemloft.net> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> Cc: Stefano Brivio <sbrivio@redhat.com> Link: https://lkml.kernel.org/n/tip-wq410s2wuqv5k980bidw0ju8@git.kernel.org Signed-off-by:

Arnaldo Carvalho de Melo <acme@redhat.com>

tools/include/uapi/linux/if_link.h

+19 −0

Original line number	Diff line number	Diff line
		@@ -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,

Admin message