From e59b4f1ef3f4c8d85ae70b83e624f85bfe95d899 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Fri, 28 Jan 2011 18:34:07 +0100
Subject: [PATCH] --- yaml --- r: 232844 b: refs/heads/master c:
 1181e1daace88018b2ff66592aa10a4791d705ff h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/batman-adv/vis.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d372eda4fe73..ffb2190b443c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dda9fc6b2c59f056e7a2b313b8423b14a4df25a9
+refs/heads/master: 1181e1daace88018b2ff66592aa10a4791d705ff
diff --git a/trunk/net/batman-adv/vis.c b/trunk/net/batman-adv/vis.c
index 988296cdf7c5..de1022cacaf7 100644
--- a/trunk/net/batman-adv/vis.c
+++ b/trunk/net/batman-adv/vis.c
@@ -816,7 +816,7 @@ static void send_vis_packets(struct work_struct *work)
 		container_of(work, struct delayed_work, work);
 	struct bat_priv *bat_priv =
 		container_of(delayed_work, struct bat_priv, vis_work);
-	struct vis_info *info, *temp;
+	struct vis_info *info;
 
 	spin_lock_bh(&bat_priv->vis_hash_lock);
 	purge_vis_packets(bat_priv);
@@ -826,8 +826,9 @@ static void send_vis_packets(struct work_struct *work)
 		send_list_add(bat_priv, bat_priv->my_vis_info);
 	}
 
-	list_for_each_entry_safe(info, temp, &bat_priv->vis_send_list,
-				 send_list) {
+	while (!list_empty(&bat_priv->vis_send_list)) {
+		info = list_first_entry(&bat_priv->vis_send_list,
+					typeof(*info), send_list);
 
 		kref_get(&info->refcount);
 		spin_unlock_bh(&bat_priv->vis_hash_lock);