netns_ifaddrs: only use struct rtnl_link_stats64

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/include/netns_ifaddrs.c b/src/include/netns_ifaddrs.c
index 855d716078ddbe93ceb761bbc8c6e566eaefff60..8291660e402b2e5d3953e6371a4963de85928d65 100644 (file)
--- 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 4ab7f46c7548884612c6530072ef5d70cc5642b2..0290e84ac15498c22c8377a047f1a59e0cf0eb02 100644 (file)
--- 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