Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <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>

+19
+19
tools/include/uapi/linux/if_link.h
··· 288 288 IFLA_BR_MCAST_IGMP_VERSION, 289 289 IFLA_BR_MCAST_MLD_VERSION, 290 290 IFLA_BR_VLAN_STATS_PER_PORT, 291 + IFLA_BR_MULTI_BOOLOPT, 291 292 __IFLA_BR_MAX, 292 293 }; 293 294 ··· 534 533 IFLA_VXLAN_LABEL, 535 534 IFLA_VXLAN_GPE, 536 535 IFLA_VXLAN_TTL_INHERIT, 536 + IFLA_VXLAN_DF, 537 537 __IFLA_VXLAN_MAX 538 538 }; 539 539 #define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1) ··· 542 540 struct ifla_vxlan_port_range { 543 541 __be16 low; 544 542 __be16 high; 543 + }; 544 + 545 + enum ifla_vxlan_df { 546 + VXLAN_DF_UNSET = 0, 547 + VXLAN_DF_SET, 548 + VXLAN_DF_INHERIT, 549 + __VXLAN_DF_END, 550 + VXLAN_DF_MAX = __VXLAN_DF_END - 1, 545 551 }; 546 552 547 553 /* GENEVE section */ ··· 567 557 IFLA_GENEVE_UDP_ZERO_CSUM6_RX, 568 558 IFLA_GENEVE_LABEL, 569 559 IFLA_GENEVE_TTL_INHERIT, 560 + IFLA_GENEVE_DF, 570 561 __IFLA_GENEVE_MAX 571 562 }; 572 563 #define IFLA_GENEVE_MAX (__IFLA_GENEVE_MAX - 1) 564 + 565 + enum ifla_geneve_df { 566 + GENEVE_DF_UNSET = 0, 567 + GENEVE_DF_SET, 568 + GENEVE_DF_INHERIT, 569 + __GENEVE_DF_END, 570 + GENEVE_DF_MAX = __GENEVE_DF_END - 1, 571 + }; 573 572 574 573 /* PPP section */ 575 574 enum {