The following commit has been merged in the master branch: commit 0c5e45b63d22c6efa6f829c617d8f36688e53c5d 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 Signed-off-by: Antonio Quartulli ordex@autistici.org

diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 8193650..b8d4ac1 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -265,9 +265,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);