Skip to contentSkip to conversation

tools headers uapi: Update linux/if_link.h header copy

tip:perf/urgent tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Oct 31, 2018

lore
Share & tools
lore

tip-bot for Arnaldo Carvalho de Melo

author merge bot
#0 lore raw
Commit-ID:  76b0b801782b34b3028dcef3de36cb634e3908a8
Gitweb:     https://git.kernel.org/tip/76b0b801782b34b3028dcef3de36cb634e3908a8
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Tue, 30 Oct 2018 17:06:57 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Wed, 31 Oct 2018 09:57:54 -0300

tools headers uapi: Update linux/if_link.h header copy

To pick the changes from:

9163a0fc1f0c ("net: bridge: add support for per-port vlan stats")

And silence this 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 Alexei Starovoitov <[email protected]>
Cc David S. Miller <[email protected]>
Cc Eric Leblond <[email protected]>
Cc Nikolay Aleksandrov <[email protected]>
Link https://lkml.kernel.org/n/[email protected] open here
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
---
 tools/include/uapi/linux/if_link.h | 1 +
 1 file changed, 1 insertion(+)
tools/include/uapi/linux/if_link.h +1 -0
index 58faab897201..1debfa42cba1 100644
@@ -287,6 +287,7 @@ enum {
 	IFLA_BR_MCAST_STATS_ENABLED,
 	IFLA_BR_MCAST_IGMP_VERSION,
 	IFLA_BR_MCAST_MLD_VERSION,
+	IFLA_BR_VLAN_STATS_PER_PORT,
 	__IFLA_BR_MAX,
 };