diff options
author | Sven Eckelmann <sven@narfation.org> | 2012-06-03 16:19:16 -0400 |
---|---|---|
committer | Antonio Quartulli <ordex@autistici.org> | 2012-06-28 02:45:04 -0400 |
commit | edbf7ff72312afcc502014ccf3c72c49fa55722a (patch) | |
tree | c0055f7fd6f1cb190082493faf079759016e8f8b /net | |
parent | 4d5d2db8d5a40b18e562fe2fa4ef9b1f9710ff82 (diff) |
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')
-rw-r--r-- | net/batman-adv/vis.c | 2 | ||||
-rw-r--r-- | net/batman-adv/vis.h | 2 |
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) | |||
674 | continue; | 674 | continue; |
675 | 675 | ||
676 | if (batadv_has_timed_out(info->first_seen, | 676 | if (batadv_has_timed_out(info->first_seen, |
677 | VIS_TIMEOUT)) { | 677 | BATADV_VIS_TIMEOUT)) { |
678 | hlist_del(node); | 678 | hlist_del(node); |
679 | batadv_send_list_del(info); | 679 | batadv_send_list_del(info); |
680 | kref_put(&info->refcount, batadv_free_info); | 680 | 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 @@ | |||
21 | #define _NET_BATMAN_ADV_VIS_H_ | 21 | #define _NET_BATMAN_ADV_VIS_H_ |
22 | 22 | ||
23 | /* timeout of vis packets in miliseconds */ | 23 | /* timeout of vis packets in miliseconds */ |
24 | #define VIS_TIMEOUT 200000 | 24 | #define BATADV_VIS_TIMEOUT 200000 |
25 | 25 | ||
26 | int batadv_vis_seq_print_text(struct seq_file *seq, void *offset); | 26 | int batadv_vis_seq_print_text(struct seq_file *seq, void *offset); |
27 | void batadv_receive_server_sync_packet(struct bat_priv *bat_priv, | 27 | void batadv_receive_server_sync_packet(struct bat_priv *bat_priv, |