batman-adv: Prefix unicast 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/originator.c b/net/batman-adv/originator.c
index bf9ec39..1980696 100644 (file)
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@ -370,7 +370,7 @@ static void _batadv_purge_orig(struct bat_priv *bat_priv)
                        }
 
                        if (batadv_has_timed_out(orig_node->last_frag_packet,
-                                                FRAG_TIMEOUT))
+                                                BATADV_FRAG_TIMEOUT))
                                batadv_frag_list_free(&orig_node->frag_list);
                }
                spin_unlock_bh(list_lock);

diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c
index c8da6b0..8098320 100644 (file)
--- a/net/batman-adv/unicast.c
+++ b/net/batman-adv/unicast.c
@@ -98,7 +98,7 @@ static int batadv_frag_create_buffer(struct list_head *head)
        int i;
        struct frag_packet_list_entry *tfp;
 
-       for (i = 0; i < FRAG_BUFFER_SIZE; i++) {
+       for (i = 0; i < BATADV_FRAG_BUFFER_SIZE; i++) {
                tfp = kmalloc(sizeof(*tfp), GFP_ATOMIC);
                if (!tfp) {
                        batadv_frag_list_free(head);

diff --git a/net/batman-adv/unicast.h b/net/batman-adv/unicast.h
index 9257b83..936287f 100644 (file)
--- a/net/batman-adv/unicast.h
+++ b/net/batman-adv/unicast.h
@@ -22,8 +22,8 @@
 
 #include "packet.h"
 
-#define FRAG_TIMEOUT 10000     /* purge frag list entries after time in ms */
-#define FRAG_BUFFER_SIZE 6     /* number of list elements in buffer */
+#define BATADV_FRAG_TIMEOUT 10000 /* purge frag list entries after time in ms */
+#define BATADV_FRAG_BUFFER_SIZE 6 /* number of list elements in buffer */
 
 int batadv_frag_reassemble_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
                               struct sk_buff **new_skb);