From: Eugene Syromyatnikov <evgsyr@gmail.com>
Date: Thu, 1 Nov 2018 15:31:14 +0000 (+0100)
Subject: xlat: add IFLA_BR_VLAN_STATS_PER_PORT to rtnl_ifla_info_data_bridge_attrs
X-Git-Tag: v4.26~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=665dd0ece815c07bee6e5ebd42b427adecd83a86;p=strace

xlat: add IFLA_BR_VLAN_STATS_PER_PORT to rtnl_ifla_info_data_bridge_attrs

* xlat/rtnl_ifla_info_data_bridge_attrs.in
(IFLA_BR_VLAN_STATS_PER_PORT): New constant, introduced by Linux commit
v4.20-rc1~14^2~90.
* rtnl_link.c (ifla_info_data_bridge_nla_decoders): Add
IFLA_BR_VLAN_STATS_PER_PORT.
* NEWS: Mention this.
* tests/nlattr_ifla_linkinfo.c (main): Check it.

Co-Authored-by: Dmitry V. Levin <ldv@altlinux.org>
---

diff --git a/NEWS b/NEWS
index 81eef8f9..648eb905 100644
--- a/NEWS
+++ b/NEWS
@@ -23,7 +23,7 @@ Noteworthy changes in release ?.?? (????-??-??)
   * Enhanced decoding of getsockopt SO_ERROR option.
   * Enhanced error diagnostics when the first exec fails.
   * Added %net as a short form of %network in syscall specifications.
-  * Updated lists of FAN_* and SOL_* constants.
+  * Updated lists of FAN_*, IFLA_*, and SOL_* constants.
   * Enhanced manual page.
 
 * Bug fixes
diff --git a/rtnl_link.c b/rtnl_link.c
index fa6278ef..f0e83fe7 100644
--- a/rtnl_link.c
+++ b/rtnl_link.c
@@ -314,6 +314,7 @@ static const nla_decoder_t ifla_info_data_bridge_nla_decoders[] = {
 	[IFLA_BR_MCAST_STATS_ENABLED]		= decode_nla_u8,
 	[IFLA_BR_MCAST_IGMP_VERSION]		= decode_nla_u8,
 	[IFLA_BR_MCAST_MLD_VERSION]		= decode_nla_u8,
+	[IFLA_BR_VLAN_STATS_PER_PORT]		= decode_nla_u8,
 };
 
 bool
diff --git a/tests/nlattr_ifla_linkinfo.c b/tests/nlattr_ifla_linkinfo.c
index 8074cf2c..901baa04 100644
--- a/tests/nlattr_ifla_linkinfo.c
+++ b/tests/nlattr_ifla_linkinfo.c
@@ -350,7 +350,7 @@ main(void)
 		{ 20, "IFLA_BR_GROUP_ADDR" },
 		{ 21, "IFLA_BR_FDB_FLUSH" },
 		{ 40, "IFLA_BR_PAD" },
-		{ 45, "0x2d /* IFLA_BR_??? */" },
+		{ 46, "0x2e /* IFLA_BR_??? */" },
 	};
 
 	for (size_t k = 0; k < ARRAY_SIZE(und_br_attrs); k++) {
@@ -479,6 +479,7 @@ main(void)
 		{ 42, "IFLA_BR_MCAST_STATS_ENABLED" },
 		{ 43, "IFLA_BR_MCAST_IGMP_VERSION" },
 		{ 44, "IFLA_BR_MCAST_MLD_VERSION" },
+		{ 45, "IFLA_BR_VLAN_STATS_PER_PORT" },
 	};
 
 	for (size_t k = 0; k < ARRAY_SIZE(u8_br_attrs); k++) {
diff --git a/xlat/rtnl_ifla_info_data_bridge_attrs.in b/xlat/rtnl_ifla_info_data_bridge_attrs.in
index 524dc8b5..8446100a 100644
--- a/xlat/rtnl_ifla_info_data_bridge_attrs.in
+++ b/xlat/rtnl_ifla_info_data_bridge_attrs.in
@@ -44,3 +44,4 @@ IFLA_BR_VLAN_STATS_ENABLED		41
 IFLA_BR_MCAST_STATS_ENABLED		42
 IFLA_BR_MCAST_IGMP_VERSION		43
 IFLA_BR_MCAST_MLD_VERSION		44
+IFLA_BR_VLAN_STATS_PER_PORT		45