84 lines
2.4 KiB
Diff
84 lines
2.4 KiB
Diff
From 526176cf61c011c2b63d7b9d86581f54f60e55cd Mon Sep 17 00:00:00 2001
|
|
From: Jakub Kicinski <kuba@kernel.org>
|
|
Date: Sun, 18 Oct 2020 14:31:45 -0700
|
|
Subject: [PATCH 28/37] update UAPI header copies
|
|
|
|
Update to kernel commit 9453b2d4694c.
|
|
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
|
|
(cherry picked from commit 77613ca972ac37f11477539be8d2b604972e9c18)
|
|
---
|
|
uapi/linux/genetlink.h | 11 +++++++++++
|
|
uapi/linux/netlink.h | 4 ++++
|
|
2 files changed, 15 insertions(+)
|
|
|
|
diff --git a/uapi/linux/genetlink.h b/uapi/linux/genetlink.h
|
|
index 7c6c390c48ee..9fa720ee87ae 100644
|
|
--- a/uapi/linux/genetlink.h
|
|
+++ b/uapi/linux/genetlink.h
|
|
@@ -64,6 +64,8 @@ enum {
|
|
CTRL_ATTR_OPS,
|
|
CTRL_ATTR_MCAST_GROUPS,
|
|
CTRL_ATTR_POLICY,
|
|
+ CTRL_ATTR_OP_POLICY,
|
|
+ CTRL_ATTR_OP,
|
|
__CTRL_ATTR_MAX,
|
|
};
|
|
|
|
@@ -85,6 +87,15 @@ enum {
|
|
__CTRL_ATTR_MCAST_GRP_MAX,
|
|
};
|
|
|
|
+enum {
|
|
+ CTRL_ATTR_POLICY_UNSPEC,
|
|
+ CTRL_ATTR_POLICY_DO,
|
|
+ CTRL_ATTR_POLICY_DUMP,
|
|
+
|
|
+ __CTRL_ATTR_POLICY_DUMP_MAX,
|
|
+ CTRL_ATTR_POLICY_DUMP_MAX = __CTRL_ATTR_POLICY_DUMP_MAX - 1
|
|
+};
|
|
+
|
|
#define CTRL_ATTR_MCAST_GRP_MAX (__CTRL_ATTR_MCAST_GRP_MAX - 1)
|
|
|
|
|
|
diff --git a/uapi/linux/netlink.h b/uapi/linux/netlink.h
|
|
index 695c88e3c29d..dfef006be9f9 100644
|
|
--- a/uapi/linux/netlink.h
|
|
+++ b/uapi/linux/netlink.h
|
|
@@ -129,6 +129,7 @@ struct nlmsgerr {
|
|
* @NLMSGERR_ATTR_COOKIE: arbitrary subsystem specific cookie to
|
|
* be used - in the success case - to identify a created
|
|
* object or operation or similar (binary)
|
|
+ * @NLMSGERR_ATTR_POLICY: policy for a rejected attribute
|
|
* @__NLMSGERR_ATTR_MAX: number of attributes
|
|
* @NLMSGERR_ATTR_MAX: highest attribute number
|
|
*/
|
|
@@ -137,6 +138,7 @@ enum nlmsgerr_attrs {
|
|
NLMSGERR_ATTR_MSG,
|
|
NLMSGERR_ATTR_OFFS,
|
|
NLMSGERR_ATTR_COOKIE,
|
|
+ NLMSGERR_ATTR_POLICY,
|
|
|
|
__NLMSGERR_ATTR_MAX,
|
|
NLMSGERR_ATTR_MAX = __NLMSGERR_ATTR_MAX - 1
|
|
@@ -327,6 +329,7 @@ enum netlink_attribute_type {
|
|
* the index, if limited inside the nesting (U32)
|
|
* @NL_POLICY_TYPE_ATTR_BITFIELD32_MASK: valid mask for the
|
|
* bitfield32 type (U32)
|
|
+ * @NL_POLICY_TYPE_ATTR_MASK: mask of valid bits for unsigned integers (U64)
|
|
* @NL_POLICY_TYPE_ATTR_PAD: pad attribute for 64-bit alignment
|
|
*/
|
|
enum netlink_policy_type_attr {
|
|
@@ -342,6 +345,7 @@ enum netlink_policy_type_attr {
|
|
NL_POLICY_TYPE_ATTR_POLICY_MAXTYPE,
|
|
NL_POLICY_TYPE_ATTR_BITFIELD32_MASK,
|
|
NL_POLICY_TYPE_ATTR_PAD,
|
|
+ NL_POLICY_TYPE_ATTR_MASK,
|
|
|
|
/* keep last */
|
|
__NL_POLICY_TYPE_ATTR_MAX,
|
|
--
|
|
2.26.2
|
|
|