---

yaml --- r: 314712 b: refs/heads/master c: edbf7ff h: refs/heads/master v: v3
git-mirror · Jun 28, 2012 · 701463e · 701463e
1 parent 25d4277
commit 701463e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d5d2db8d5a40b18e562fe2fa4ef9b1f9710ff82
+refs/heads/master: edbf7ff72312afcc502014ccf3c72c49fa55722a
diff --git a/trunk/net/batman-adv/vis.c b/trunk/net/batman-adv/vis.c
@@ -674,7 +674,7 @@ static void batadv_purge_vis_packets(struct bat_priv *bat_priv)
 				continue;
 
 			if (batadv_has_timed_out(info->first_seen,
-						 VIS_TIMEOUT)) {
+						 BATADV_VIS_TIMEOUT)) {
 				hlist_del(node);
 				batadv_send_list_del(info);
 				kref_put(&info->refcount, batadv_free_info);

diff --git a/trunk/net/batman-adv/vis.h b/trunk/net/batman-adv/vis.h
@@ -21,7 +21,7 @@
 #define _NET_BATMAN_ADV_VIS_H_
 
 /* timeout of vis packets in miliseconds */
-#define VIS_TIMEOUT		200000
+#define BATADV_VIS_TIMEOUT		200000
 
 int batadv_vis_seq_print_text(struct seq_file *seq, void *offset);
 void batadv_receive_server_sync_packet(struct bat_priv *bat_priv,