From c25f6b9507660fdec088b20f8672a41c983e4f6d Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Mon, 5 Mar 2012 16:39:02 -0500 Subject: [PATCH] --- yaml --- r: 290780 b: refs/heads/master c: 7c1e51a34afb110a010a73141a2b5f000f798875 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/netdevice.h | 2 ++ trunk/net/core/dev.c | 9 +++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4b60f4c24c03..c345bb616836 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 051d3b50430160a86cbe4a2deef219c8038bd03f +refs/heads/master: 7c1e51a34afb110a010a73141a2b5f000f798875 diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h index f1b7d037c2c5..4d279c5287f8 100644 --- a/trunk/include/linux/netdevice.h +++ b/trunk/include/linux/netdevice.h @@ -2557,6 +2557,8 @@ extern void dev_load(struct net *net, const char *name); extern void dev_mcast_init(void); extern struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev, struct rtnl_link_stats64 *storage); +extern void netdev_stats_to_stats64(struct rtnl_link_stats64 *stats64, + const struct net_device_stats *netdev_stats); extern int netdev_max_backlog; extern int netdev_tstamp_prequeue; diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 763a0eda7158..5ef3b65c3687 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -5834,12 +5834,12 @@ void netdev_run_todo(void) /* Convert net_device_stats to rtnl_link_stats64. They have the same * fields in the same order, with only the type differing. */ -static void netdev_stats_to_stats64(struct rtnl_link_stats64 *stats64, - const struct net_device_stats *netdev_stats) +void netdev_stats_to_stats64(struct rtnl_link_stats64 *stats64, + const struct net_device_stats *netdev_stats) { #if BITS_PER_LONG == 64 - BUILD_BUG_ON(sizeof(*stats64) != sizeof(*netdev_stats)); - memcpy(stats64, netdev_stats, sizeof(*stats64)); + BUILD_BUG_ON(sizeof(*stats64) != sizeof(*netdev_stats)); + memcpy(stats64, netdev_stats, sizeof(*stats64)); #else size_t i, n = sizeof(*stats64) / sizeof(u64); const unsigned long *src = (const unsigned long *)netdev_stats; @@ -5851,6 +5851,7 @@ static void netdev_stats_to_stats64(struct rtnl_link_stats64 *stats64, dst[i] = src[i]; #endif } +EXPORT_SYMBOL(netdev_stats_to_stats64); /** * dev_get_stats - get network device statistics