summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2010-08-13 10:06:42 +0200
committerMartin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com>2010-08-13 10:06:55 +0200
commite402e38c6b148febf8c3c39546e24584eaa23e42 (patch)
treefeaea65789054ccaf76496b943a0a9199ce0a276 /arch
parentb47ac63c7229dd13daf4d7eed806d720f769c526 (diff)
downloadlinux-stable-e402e38c6b148febf8c3c39546e24584eaa23e42.tar.gz
linux-stable-e402e38c6b148febf8c3c39546e24584eaa23e42.tar.bz2
linux-stable-e402e38c6b148febf8c3c39546e24584eaa23e42.zip
[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 <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/s390/appldata/appldata_net_sum.c3
1 files changed, 2 insertions, 1 deletions
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;