The following commit has been merged in the master branch: commit c782c5ab079764fc7f552cafc314742519f9fe2a Author: Sven Eckelmann sven@narfation.org Date: Sun Jun 3 22:19:16 2012 +0200

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/vis.c b/vis.c index 596eacc..a439ed6 100644 --- a/vis.c +++ b/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/vis.h b/vis.h index dad5958..16a1a6b 100644 --- a/vis.h +++ b/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,