commit edbf7ff72312afcc502014ccf3c72c49fa55722a
author Sven Eckelmann <sven@narfation.org> Sun Jun 03 22:19:16 2012 +0200
committer Antonio Quartulli <ordex@autistici.org> Thu Jun 28 08:45:04 2012 +0200
tree c0055f7fd6f1cb190082493faf079759016e8f8b
parent 4d5d2db8d5a40b18e562fe2fa4ef9b1f9710ff82

batman-adv: Prefix vis defines with BATADV_

Reported-by: Martin Hundebøll <martin@hundeboll.net>
Signed-off-by: Sven Eckelmann <sven@narfation.org>

net/batman-adv/vis.h

diff --git a/net/batman-adv/vis.h b/net/batman-adv/vis.h
index dad5958..16a1a6b 100644
--- a/net/batman-adv/vis.h
+++ b/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,