diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 10:54:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 10:54:04 -0700 |
| commit | 2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8 (patch) | |
| tree | 8e54da82410c8e57ff53b3d69d5760ff28bc236f /arch/s390/appldata/appldata_net_sum.c | |
| parent | Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 (diff) | |
| parent | [S390] partitions: fix build error in ibm partition detection code (diff) | |
| download | linux-dev-2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8.tar.xz linux-dev-2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8.zip | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] partitions: fix build error in ibm partition detection code
[S390] appldata: fix dev_get_stats 64 bit conversion
[S390] wire up prlimit64 and fanotify* syscalls
[S390] zcrypt: fix Kconfig dependencies
[S390] sys_personality: follow u_long to unsigned int conversion
[S390] dasd: fix format string types
Diffstat (limited to 'arch/s390/appldata/appldata_net_sum.c')
| -rw-r--r-- | arch/s390/appldata/appldata_net_sum.c | 3 |
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; |