summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle McMartin <kyle@dreadnought.i.jkkm.org>2010-09-28 18:19:24 +0200
committerKyle McMartin <kyle@dreadnought.i.jkkm.org>2010-10-14 02:34:04 +0200
commitc442ef96bfe1a981d44dd09d49a1eed93b94e82a (patch)
tree2a4bfbff4c8cbd7abac886f0898d5ec76c60ccde
parentMerge branch 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff)
downloadlinux-c442ef96bfe1a981d44dd09d49a1eed93b94e82a.tar.xz
linux-c442ef96bfe1a981d44dd09d49a1eed93b94e82a.zip
parisc: squelch warning when using dev_get_stats
And switch to struct rtnl_link_stats64... Signed-off-by: Kyle McMartin <kyle@redhat.com>
-rw-r--r--drivers/parisc/led.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c
index c5c14dd3734f..2350e8a86eef 100644
--- a/drivers/parisc/led.c
+++ b/drivers/parisc/led.c
@@ -346,8 +346,8 @@ static __inline__ int led_get_net_activity(void)
#ifndef CONFIG_NET
return 0;
#else
- static unsigned long rx_total_last, tx_total_last;
- unsigned long rx_total, tx_total;
+ static u64 rx_total_last, tx_total_last;
+ u64 rx_total, tx_total;
struct net_device *dev;
int retval;
@@ -356,7 +356,7 @@ static __inline__ int led_get_net_activity(void)
/* we are running as a workqueue task, so we can use an RCU lookup */
rcu_read_lock();
for_each_netdev_rcu(&init_net, dev) {
- const struct net_device_stats *stats;
+ const struct rtnl_link_stats64 *stats;
struct rtnl_link_stats64 temp;
struct in_device *in_dev = __in_dev_get_rcu(dev);
if (!in_dev || !in_dev->ifa_list)