batman-adv: Prefix main defines with BATADV_

[cascardo/linux.git] / net / batman-adv / unicast.c

diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c
index 472436a..8454d91 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);
@@ -253,7 +253,7 @@ int batadv_frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
        memcpy(frag1, &tmp_uc, sizeof(tmp_uc));
 
        frag1->header.ttl--;
-       frag1->header.version = COMPAT_VERSION;
+       frag1->header.version = BATADV_COMPAT_VERSION;
        frag1->header.packet_type = BAT_UNICAST_FRAG;
 
        memcpy(frag1->orig, primary_if->net_dev->dev_addr, ETH_ALEN);
@@ -319,11 +319,11 @@ find_router:
 
        unicast_packet = (struct unicast_packet *)skb->data;
 
-       unicast_packet->header.version = COMPAT_VERSION;
+       unicast_packet->header.version = BATADV_COMPAT_VERSION;
        /* batman packet type: unicast */
        unicast_packet->header.packet_type = BAT_UNICAST;
        /* set unicast ttl */
-       unicast_packet->header.ttl = TTL;
+       unicast_packet->header.ttl = BATADV_TTL;
        /* copy the destination for faster routing */
        memcpy(unicast_packet->dest, orig_node->orig, ETH_ALEN);
        /* set the destination tt version number */