summaryrefslogtreecommitdiffstats
path: root/net/batman-adv
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2012-06-03 22:19:16 +0200
committerAntonio Quartulli <ordex@autistici.org>2012-06-28 08:45:04 +0200
commitedbf7ff72312afcc502014ccf3c72c49fa55722a (patch)
treec0055f7fd6f1cb190082493faf079759016e8f8b /net/batman-adv
parent4d5d2db8d5a40b18e562fe2fa4ef9b1f9710ff82 (diff)
downloadlinux-edbf7ff72312afcc502014ccf3c72c49fa55722a.tar.gz
linux-edbf7ff72312afcc502014ccf3c72c49fa55722a.tar.bz2
linux-edbf7ff72312afcc502014ccf3c72c49fa55722a.zip
batman-adv: Prefix vis defines with BATADV_
Reported-by: Martin Hundebøll <martin@hundeboll.net> Signed-off-by: Sven Eckelmann <sven@narfation.org>
Diffstat (limited to 'net/batman-adv')
-rw-r--r--net/batman-adv/vis.c2
-rw-r--r--net/batman-adv/vis.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/vis.c b/net/batman-adv/vis.c
index 596eacc3dd1c..a439ed6616ea 100644
--- 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 dad595870f8f..16a1a6b7e2c3 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,