[lxc-devel] [lxc/master] netns_getifaddrs: adapt to kernel changes

[brauner on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 418 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20190419/630e7d57/attachment.bin>
-------------- next part --------------
From c8ca5a435cc4bc28c3f14d89cc30c38fd177a310 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner at ubuntu.com>
Date: Fri, 19 Apr 2019 15:24:51 +0200
Subject: [PATCH] netns_getifaddrs: adapt to kernel changes

s/NETLINK_DUMP_STRICT_CHK/NETLINK_GET_STRICT_CHK/g

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
---
 src/include/netns_ifaddrs.c | 2 +-
 src/lxc/macro.h             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/include/netns_ifaddrs.c b/src/include/netns_ifaddrs.c
index 1c8b92b66b..7ac80e3d60 100644
--- a/src/include/netns_ifaddrs.c
+++ b/src/include/netns_ifaddrs.c
@@ -468,7 +468,7 @@ static int __rtnl_enumerate(int link_af, int addr_af, __s32 netns_id,
 	if (fd < 0)
 		return -1;
 
-	r = setsockopt(fd, SOL_NETLINK, NETLINK_DUMP_STRICT_CHK, &(int){1},
+	r = setsockopt(fd, SOL_NETLINK, NETLINK_GET_STRICT_CHK, &(int){1},
 		       sizeof(int));
 	if (r < 0 && netns_id >= 0) {
 		close(fd);
diff --git a/src/lxc/macro.h b/src/lxc/macro.h
index 6e07516f20..b83e439115 100644
--- a/src/lxc/macro.h
+++ b/src/lxc/macro.h
@@ -240,8 +240,8 @@ extern int __build_bug_on_failed;
 #define prctl_arg(x) ((unsigned long)x)
 
 /* networking */
-#ifndef NETLINK_DUMP_STRICT_CHK
-#define NETLINK_DUMP_STRICT_CHK 12
+#ifndef NETLINK_GET_STRICT_CHK
+#define NETLINK_GET_STRICT_CHK 12
 #endif
 
 #ifndef SOL_NETLINK