diff --git a/[refs] b/[refs]
index 36fcd672de08..ca1cfad1abcc 100644
--- 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
index 596eacc3dd1c..a439ed6616ea 100644
--- 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
index dad595870f8f..16a1a6b7e2c3 100644
--- 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,