netns_ifaddrs: only use struct rtnl_link_stats64

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
lxc · Sep 30, 2018 · 3ccf815 · 3ccf815
1 parent da5efb6
commit 3ccf815
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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