The following commit has been merged in the next branch: commit ce3dbe0051700790d2e2bdafb14d28850f9a57a9 Author: Marek Lindner lindner_marek@yahoo.de Date: Sat Jun 23 11:46:05 2012 +0200

batman-adv: fix counter summary length

Signed-off-by: Marek Lindner lindner_marek@yahoo.de Acked-by: Martin Hundebøll martin@hundeboll.net

diff --git a/main.h b/main.h index e76f9c6..6dca9c4 100644 --- a/main.h +++ b/main.h @@ -267,9 +267,8 @@ static inline void batadv_add_counter(struct batadv_priv *bat_priv, size_t idx, static inline uint64_t batadv_sum_counter(struct batadv_priv *bat_priv, size_t idx) { - uint64_t *counters; + uint64_t *counters, sum = 0; int cpu; - int sum = 0;

for_each_possible_cpu(cpu) { counters = per_cpu_ptr(bat_priv->bat_counters, cpu);