This primarily pulls in the ABI changes needed to detect truncated lists of netlink attributes as well as the bits necessary to elevate IFLA_VF_INFO stats out of IFLA_VFINFO_LIST. Unrelated changes in the affected files were also synced.
Signed-off-by: Edwin Peer <edwin.p...@broadcom.com>
---
include/uapi/linux/if_link.h | 2 ++
include/uapi/linux/netlink.h | 1 +
include/uapi/linux/rtnetlink.h | 1 +
3 files changed, 4 insertions(+)
diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 97a95cf7e4f9..2889897bc2bb 100644
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -341,6 +341,7 @@ enum {
IFLA_ALT_IFNAME, /* Alternative ifname */
IFLA_PERM_ADDRESS,
IFLA_PROTO_DOWN_REASON,
+ IFLA_VFSTATS_LIST,
__IFLA_MAX
};
@@ -807,6 +808,7 @@ enum {
IFLA_GTP_FD1,
IFLA_GTP_PDP_HASHSIZE,
IFLA_GTP_ROLE,
+ IFLA_GTP_COLLECT_METADATA,
__IFLA_GTP_MAX,
};
#define IFLA_GTP_MAX (__IFLA_GTP_MAX - 1)
diff --git a/include/uapi/linux/netlink.h b/include/uapi/linux/netlink.h
index 5024c5435749..1cab84506eaf 100644
--- a/include/uapi/linux/netlink.h
+++ b/include/uapi/linux/netlink.h
@@ -57,6 +57,7 @@ struct nlmsghdr {
#define NLM_F_ECHO 0x08 /* Echo this request */
#define NLM_F_DUMP_INTR 0x10 /* Dump was inconsistent due to
sequence change */
#define NLM_F_DUMP_FILTERED 0x20 /* Dump was filtered as requested */
+#define NLM_F_NEST_TRUNCATED 0x40 /* Message contains truncated nested
attribute */
/* Modifiers to GET request */
#define NLM_F_ROOT 0x100 /* specify tree root */
diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
index c66fd247d90a..b31afc8f70a4 100644
--- a/include/uapi/linux/rtnetlink.h
+++ b/include/uapi/linux/rtnetlink.h
@@ -787,6 +787,7 @@ enum {
#define RTEXT_FILTER_MRP (1 << 4)
#define RTEXT_FILTER_CFM_CONFIG (1 << 5)
#define RTEXT_FILTER_CFM_STATUS (1 << 6)
+#define RTEXT_FILTER_VF_SEPARATE_STATS (1 << 7)
/* End of information exported to user level */
--
2.30.0
smime.p7s
Description: S/MIME Cryptographic Signature
