batman-adv: Prefix vis defines with BATADV_

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

diff --git a/net/batman-adv/vis.c b/net/batman-adv/vis.c
index 596eacc3dd1c8adb10b78a6fa6da7215f8600867..a439ed6616ea38aa4579b1471feb8de72ef74a48 100644 (file)
--- a/net/batman-adv/vis.c
+++ b/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/net/batman-adv/vis.h b/net/batman-adv/vis.h
index dad595870f8f4717234eb6c64497eebfe8125b87..16a1a6b7e2c3f073e81996b96477e63e76073883 100644 (file)
--- 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,