[lxc-devel] [lxc/master] netns_ifaddrs: only use struct rtnl_link_stats64

[brauner on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 364 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20180930/9a017ced/attachment.bin>
-------------- next part --------------
From 3ccf815f79f8c12f98ad6e73c301930ddcb88fe9 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner at ubuntu.com>
Date: Sun, 30 Sep 2018 20:58:06 +0200
Subject: [PATCH] netns_ifaddrs: only use struct rtnl_link_stats64

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

diff --git a/src/include/netns_ifaddrs.c b/src/include/netns_ifaddrs.c
index 855d71607..8291660e4 100644
--- a/src/include/netns_ifaddrs.c
+++ b/src/include/netns_ifaddrs.c
@@ -233,16 +233,13 @@ static int nl_msg_to_ifaddr(void *pctx, bool *netnsid_aware, struct nlmsghdr *h)
 #if HAVE_STRUCT_RTNL_LINK_STATS64
 			case IFLA_STATS64:
 				ifs->ifa.ifa_stats_type = IFLA_STATS64;
-				memcpy(&ifs->ifa.ifa_stats64, __RTA_DATA(rta),
-				       __RTA_DATALEN(rta));
-				break;
 #else
 			case IFLA_STATS:
 				ifs->ifa.ifa_stats_type = IFLA_STATS;
-				memcpy(&ifs->ifa.ifa_stats32, __RTA_DATA(rta),
+#endif
+				memcpy(&ifs->ifa.ifa_stats, __RTA_DATA(rta),
 				       __RTA_DATALEN(rta));
 				break;
-#endif
 			case IFLA_MTU:
 				memcpy(&ifs->ifa.ifa_mtu, __RTA_DATA(rta),
 				       sizeof(int));
diff --git a/src/include/netns_ifaddrs.h b/src/include/netns_ifaddrs.h
index 4ab7f46c7..0290e84ac 100644
--- a/src/include/netns_ifaddrs.h
+++ b/src/include/netns_ifaddrs.h
@@ -40,8 +40,11 @@ struct netns_ifaddrs {
 
 	/* These fields are not present struct ifaddrs. */
 	int ifa_stats_type;
-	struct rtnl_link_stats ifa_stats32;
-	struct rtnl_link_stats64 ifa_stats64;
+#if HAVE_STRUCT_RTNL_LINK_STATS64
+	struct rtnl_link_stats64 ifa_stats;
+#else
+	struct rtnl_link_stats ifa_stats;
+#endif
 };
 
 #define __ifa_broadaddr ifa_ifu.ifu_broadaddr