From: Heiko Carstens Date: Fri, 13 Aug 2010 08:06:42 +0000 (+0200) Subject: [S390] appldata: fix dev_get_stats 64 bit conversion X-Git-Tag: MMI-PSA29.97-13-9~22559^2~1 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e402e38c6b148febf8c3c39546e24584eaa23e42;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git [S390] appldata: fix dev_get_stats 64 bit conversion Fix this warning: arch/s390/appldata/appldata_net_sum.c: In function 'appldata_get_net_sum_data': arch/s390/appldata/appldata_net_sum.c:89: warning: initialization from incompatible pointer type which was introduced with be1f3c2c027cc5ad735df6a45a542ed1db7ec48b "net: Enable 64-bit net device statistics on 32-bit architectures" Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky --- diff --git a/arch/s390/appldata/appldata_net_sum.c b/arch/s390/appldata/appldata_net_sum.c index f02e89ce4df1..5da7c562a90b 100644 --- a/arch/s390/appldata/appldata_net_sum.c +++ b/arch/s390/appldata/appldata_net_sum.c @@ -85,9 +85,10 @@ static void appldata_get_net_sum_data(void *data) rcu_read_lock(); for_each_netdev_rcu(&init_net, dev) { + const struct rtnl_link_stats64 *stats; struct rtnl_link_stats64 temp; - const struct net_device_stats *stats = dev_get_stats(dev, &temp); + stats = dev_get_stats(dev, &temp); rx_packets += stats->rx_packets; tx_packets += stats->tx_packets; rx_bytes += stats->rx_bytes;