History

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'

Arnaldo Carvalho de Melo committed 7 years ago

Commit 498c2031 parent 576b50e1 file · +19 −0Browse files

Showing the changes to tools/include/uapi/linux (1 of 1 file). Show all

Unified · Split

tools/include/uapi/linux/if_link.h+19−0
@@ -288,6 +288,7 @@ enum { · 287 unmodified lines
288288 IFLA_BR_MCAST_IGMP_VERSION,
289289 IFLA_BR_MCAST_MLD_VERSION,
290290 IFLA_BR_VLAN_STATS_PER_PORT,
291+ IFLA_BR_MULTI_BOOLOPT,
291292 __IFLA_BR_MAX,
292293 };
293294
@@ -533,6 +534,7 @@ enum { · 239 unmodified lines
533534 IFLA_VXLAN_LABEL,
534535 IFLA_VXLAN_GPE,
535536 IFLA_VXLAN_TTL_INHERIT,
537+ IFLA_VXLAN_DF,
536538 __IFLA_VXLAN_MAX
537539 };
538540 #define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1)
@@ -542,6 +544,14 @@ struct ifla_vxlan_port_range { · 3 unmodified lines
542544 __be16 high;
543545 };
544546
547+enum ifla_vxlan_df {
548+ VXLAN_DF_UNSET = 0,
549+ VXLAN_DF_SET,
550+ VXLAN_DF_INHERIT,
551+ __VXLAN_DF_END,
552+ VXLAN_DF_MAX = __VXLAN_DF_END - 1,
553+};
554+
545555 /* GENEVE section */
546556 enum {
547557 IFLA_GENEVE_UNSPEC,
@@ -557,10 +567,19 @@ enum { · 9 unmodified lines
557567 IFLA_GENEVE_UDP_ZERO_CSUM6_RX,
558568 IFLA_GENEVE_LABEL,
559569 IFLA_GENEVE_TTL_INHERIT,
570+ IFLA_GENEVE_DF,
560571 __IFLA_GENEVE_MAX
561572 };
562573 #define IFLA_GENEVE_MAX (__IFLA_GENEVE_MAX - 1)
563574
575+enum ifla_geneve_df {
576+ GENEVE_DF_UNSET = 0,
577+ GENEVE_DF_SET,
578+ GENEVE_DF_INHERIT,
579+ __GENEVE_DF_END,
580+ GENEVE_DF_MAX = __GENEVE_DF_END - 1,
581+};
582+
564583 /* PPP section */
565584 enum {
566585 IFLA_PPP_UNSPEC,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t