The commit is pushed to "branch-rh7-3.10.0-693.21.1.vz7.46.x-ovz" and will
appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-693.21.1.vz7.46.7
------>
commit 496d317f3b3c42669d76e8bde98393c1e9810a5f
Author: Konstantin Khorenko <[email protected]>
Date: Fri Apr 20 17:02:58 2018 +0300
Revert "net: Change number of netlink repair"
This reverts commit 9cdd731a629a0c83ae8864759944aa62d9c8bd5b.
We need to release criu package along with the vzkernel with
netlink repair number changed, but we don't want to release
criu userspace package right now, only kernel =>
revert the netlink repair number shift for now.
https://jira.sw.ru/browse/PSBM-83415
Signed-off-by: Konstantin Khorenko <[email protected]>
---
include/uapi/linux/netlink.h | 3 +--
net/netlink/af_netlink.c | 2 +-
net/netlink/af_netlink.h | 3 +--
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/include/uapi/linux/netlink.h b/include/uapi/linux/netlink.h
index 5d202cc19705..56ddadf14e0e 100644
--- a/include/uapi/linux/netlink.h
+++ b/include/uapi/linux/netlink.h
@@ -111,8 +111,7 @@ struct nlmsgerr {
#define NETLINK_LISTEN_ALL_NSID 8
#define NETLINK_LIST_MEMBERSHIPS 9
#define NETLINK_CAP_ACK 10
-
-#define NETLINK_REPAIR2 127
+#define NETLINK_REPAIR 11
struct nl_pktinfo {
__u32 group;
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 0d02a287ea79..513597d267eb 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -2192,7 +2192,7 @@ static int netlink_setsockopt(struct socket *sock, int
level, int optname,
return -EFAULT;
switch (optname) {
- case NETLINK_REPAIR2:
+ case NETLINK_REPAIR:
if (val)
nlk->flags |= NETLINK_F_REPAIR;
else
diff --git a/net/netlink/af_netlink.h b/net/netlink/af_netlink.h
index 07bac2ff1054..041b5da8bd5d 100644
--- a/net/netlink/af_netlink.h
+++ b/net/netlink/af_netlink.h
@@ -11,8 +11,7 @@
#define NETLINK_F_RECV_NO_ENOBUFS 0x8
#define NETLINK_F_LISTEN_ALL_NSID 0x10
#define NETLINK_F_CAP_ACK 0x20
-
-#define NETLINK_F_REPAIR 0x80000000
+#define NETLINK_F_REPAIR 0x40
#define NLGRPSZ(x) (ALIGN(x, sizeof(unsigned long) * 8) / 8)
#define NLGRPLONGS(x) (NLGRPSZ(x)/sizeof(unsigned long))
_______________________________________________
Devel mailing list
[email protected]
https://lists.openvz.org/mailman/listinfo/devel
