From cd3fba68bfbf173fe95a7345d02f1b7670e6532a Mon Sep 17 00:00:00 2001
From: Marek Lindner <lindner_marek@yahoo.de>
Date: Sat, 23 Jun 2012 11:46:05 +0200
Subject: [PATCH] --- yaml --- r: 314958 b: refs/heads/master c:
 0c5e45b63d22c6efa6f829c617d8f36688e53c5d h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/net/batman-adv/main.h | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e0f842f64280..690c8f22a94a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0aca2369b19de3f3f1affcc5359c3d079e4e1940
+refs/heads/master: 0c5e45b63d22c6efa6f829c617d8f36688e53c5d
diff --git a/trunk/net/batman-adv/main.h b/trunk/net/batman-adv/main.h
index 8193650e5496..b8d4ac17f001 100644
--- a/trunk/net/batman-adv/main.h
+++ b/trunk/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);