]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/blobdiff - net/batman-adv/bridge_loop_avoidance.c
batman-adv: Prefix types structs with batadv_
[mirror_ubuntu-zesty-kernel.git] / net / batman-adv / bridge_loop_avoidance.c
index b7d70845aa4ac99b867bcb140e80b1ee54f2993c..49e10d91c00bb0fe75aa33be87c42cb0bd50fbfc 100644 (file)
 #include <net/arp.h>
 #include <linux/if_vlan.h>
 
-static const uint8_t announce_mac[4] = {0x43, 0x05, 0x43, 0x05};
+static const uint8_t batadv_announce_mac[4] = {0x43, 0x05, 0x43, 0x05};
 
-static void bla_periodic_work(struct work_struct *work);
-static void bla_send_announce(struct bat_priv *bat_priv,
-                             struct backbone_gw *backbone_gw);
+static void batadv_bla_periodic_work(struct work_struct *work);
+static void batadv_bla_send_announce(struct batadv_priv *bat_priv,
+                                    struct batadv_backbone_gw *backbone_gw);
 
 /* return the index of the claim */
-static inline uint32_t choose_claim(const void *data, uint32_t size)
+static inline uint32_t batadv_choose_claim(const void *data, uint32_t size)
 {
        const unsigned char *key = data;
        uint32_t hash = 0;
@@ -58,7 +58,8 @@ static inline uint32_t choose_claim(const void *data, uint32_t size)
 }
 
 /* return the index of the backbone gateway */
-static inline uint32_t choose_backbone_gw(const void *data, uint32_t size)
+static inline uint32_t batadv_choose_backbone_gw(const void *data,
+                                                uint32_t size)
 {
        const unsigned char *key = data;
        uint32_t hash = 0;
@@ -79,46 +80,48 @@ static inline uint32_t choose_backbone_gw(const void *data, uint32_t size)
 
 
 /* compares address and vid of two backbone gws */
-static int compare_backbone_gw(const struct hlist_node *node, const void *data2)
+static int batadv_compare_backbone_gw(const struct hlist_node *node,
+                                     const void *data2)
 {
-       const void *data1 = container_of(node, struct backbone_gw,
+       const void *data1 = container_of(node, struct batadv_backbone_gw,
                                         hash_entry);
 
        return (memcmp(data1, data2, ETH_ALEN + sizeof(short)) == 0 ? 1 : 0);
 }
 
 /* compares address and vid of two claims */
-static int compare_claim(const struct hlist_node *node, const void *data2)
+static int batadv_compare_claim(const struct hlist_node *node,
+                               const void *data2)
 {
-       const void *data1 = container_of(node, struct claim,
+       const void *data1 = container_of(node, struct batadv_claim,
                                         hash_entry);
 
        return (memcmp(data1, data2, ETH_ALEN + sizeof(short)) == 0 ? 1 : 0);
 }
 
 /* free a backbone gw */
-static void backbone_gw_free_ref(struct backbone_gw *backbone_gw)
+static void batadv_backbone_gw_free_ref(struct batadv_backbone_gw *backbone_gw)
 {
        if (atomic_dec_and_test(&backbone_gw->refcount))
                kfree_rcu(backbone_gw, rcu);
 }
 
 /* finally deinitialize the claim */
-static void claim_free_rcu(struct rcu_head *rcu)
+static void batadv_claim_free_rcu(struct rcu_head *rcu)
 {
-       struct claim *claim;
+       struct batadv_claim *claim;
 
-       claim = container_of(rcu, struct claim, rcu);
+       claim = container_of(rcu, struct batadv_claim, rcu);
 
-       backbone_gw_free_ref(claim->backbone_gw);
+       batadv_backbone_gw_free_ref(claim->backbone_gw);
        kfree(claim);
 }
 
 /* free a claim, call claim_free_rcu if its the last reference */
-static void claim_free_ref(struct claim *claim)
+static void batadv_claim_free_ref(struct batadv_claim *claim)
 {
        if (atomic_dec_and_test(&claim->refcount))
-               call_rcu(&claim->rcu, claim_free_rcu);
+               call_rcu(&claim->rcu, batadv_claim_free_rcu);
 }
 
 /* @bat_priv: the bat priv with all the soft interface information
@@ -127,25 +130,25 @@ static void claim_free_ref(struct claim *claim)
  * looks for a claim in the hash, and returns it if found
  * or NULL otherwise.
  */
-static struct claim *claim_hash_find(struct bat_priv *bat_priv,
-                                    struct claim *data)
+static struct batadv_claim *batadv_claim_hash_find(struct batadv_priv *bat_priv,
+                                                  struct batadv_claim *data)
 {
-       struct hashtable_t *hash = bat_priv->claim_hash;
+       struct batadv_hashtable *hash = bat_priv->claim_hash;
        struct hlist_head *head;
        struct hlist_node *node;
-       struct claim *claim;
-       struct claim *claim_tmp = NULL;
+       struct batadv_claim *claim;
+       struct batadv_claim *claim_tmp = NULL;
        int index;
 
        if (!hash)
                return NULL;
 
-       index = choose_claim(data, hash->size);
+       index = batadv_choose_claim(data, hash->size);
        head = &hash->table[index];
 
        rcu_read_lock();
        hlist_for_each_entry_rcu(claim, node, head, hash_entry) {
-               if (!compare_claim(&claim->hash_entry, data))
+               if (!batadv_compare_claim(&claim->hash_entry, data))
                        continue;
 
                if (!atomic_inc_not_zero(&claim->refcount))
@@ -166,14 +169,15 @@ static struct claim *claim_hash_find(struct bat_priv *bat_priv,
  * looks for a claim in the hash, and returns it if found
  * or NULL otherwise.
  */
-static struct backbone_gw *backbone_hash_find(struct bat_priv *bat_priv,
-                                             uint8_t *addr, short vid)
+static struct batadv_backbone_gw *
+batadv_backbone_hash_find(struct batadv_priv *bat_priv,
+                         uint8_t *addr, short vid)
 {
-       struct hashtable_t *hash = bat_priv->backbone_hash;
+       struct batadv_hashtable *hash = bat_priv->backbone_hash;
        struct hlist_head *head;
        struct hlist_node *node;
-       struct backbone_gw search_entry, *backbone_gw;
-       struct backbone_gw *backbone_gw_tmp = NULL;
+       struct batadv_backbone_gw search_entry, *backbone_gw;
+       struct batadv_backbone_gw *backbone_gw_tmp = NULL;
        int index;
 
        if (!hash)
@@ -182,13 +186,13 @@ static struct backbone_gw *backbone_hash_find(struct bat_priv *bat_priv,
        memcpy(search_entry.orig, addr, ETH_ALEN);
        search_entry.vid = vid;
 
-       index = choose_backbone_gw(&search_entry, hash->size);
+       index = batadv_choose_backbone_gw(&search_entry, hash->size);
        head = &hash->table[index];
 
        rcu_read_lock();
        hlist_for_each_entry_rcu(backbone_gw, node, head, hash_entry) {
-               if (!compare_backbone_gw(&backbone_gw->hash_entry,
-                                        &search_entry))
+               if (!batadv_compare_backbone_gw(&backbone_gw->hash_entry,
+                                               &search_entry))
                        continue;
 
                if (!atomic_inc_not_zero(&backbone_gw->refcount))
@@ -203,12 +207,13 @@ static struct backbone_gw *backbone_hash_find(struct bat_priv *bat_priv,
 }
 
 /* delete all claims for a backbone */
-static void bla_del_backbone_claims(struct backbone_gw *backbone_gw)
+static void
+batadv_bla_del_backbone_claims(struct batadv_backbone_gw *backbone_gw)
 {
-       struct hashtable_t *hash;
+       struct batadv_hashtable *hash;
        struct hlist_node *node, *node_tmp;
        struct hlist_head *head;
-       struct claim *claim;
+       struct batadv_claim *claim;
        int i;
        spinlock_t *list_lock;  /* protects write access to the hash lists */
 
@@ -227,14 +232,14 @@ static void bla_del_backbone_claims(struct backbone_gw *backbone_gw)
                        if (claim->backbone_gw != backbone_gw)
                                continue;
 
-                       claim_free_ref(claim);
+                       batadv_claim_free_ref(claim);
                        hlist_del_rcu(node);
                }
                spin_unlock_bh(list_lock);
        }
 
        /* all claims gone, intialize CRC */
-       backbone_gw->crc = BLA_CRC_INIT;
+       backbone_gw->crc = BATADV_BLA_CRC_INIT;
 }
 
 /* @bat_priv: the bat priv with all the soft interface information
@@ -244,15 +249,15 @@ static void bla_del_backbone_claims(struct backbone_gw *backbone_gw)
  *
  * sends a claim frame according to the provided info.
  */
-static void bla_send_claim(struct bat_priv *bat_priv, uint8_t *mac,
-                          short vid, int claimtype)
+static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac,
+                                 short vid, int claimtype)
 {
        struct sk_buff *skb;
        struct ethhdr *ethhdr;
-       struct hard_iface *primary_if;
+       struct batadv_hard_iface *primary_if;
        struct net_device *soft_iface;
        uint8_t *hw_src;
-       struct bla_claim_dst local_claim_dest;
+       struct batadv_bla_claim_dst local_claim_dest;
        __be32 zeroip = 0;
 
        primary_if = batadv_primary_if_get_selected(bat_priv);
@@ -289,39 +294,39 @@ static void bla_send_claim(struct bat_priv *bat_priv, uint8_t *mac,
 
        /* now we pretend that the client would have sent this ... */
        switch (claimtype) {
-       case CLAIM_TYPE_ADD:
+       case BATADV_CLAIM_TYPE_ADD:
                /* normal claim frame
                 * set Ethernet SRC to the clients mac
                 */
                memcpy(ethhdr->h_source, mac, ETH_ALEN);
-               batadv_dbg(DBG_BLA, bat_priv,
+               batadv_dbg(BATADV_DBG_BLA, bat_priv,
                           "bla_send_claim(): CLAIM %pM on vid %d\n", mac, vid);
                break;
-       case CLAIM_TYPE_DEL:
+       case BATADV_CLAIM_TYPE_DEL:
                /* unclaim frame
                 * set HW SRC to the clients mac
                 */
                memcpy(hw_src, mac, ETH_ALEN);
-               batadv_dbg(DBG_BLA, bat_priv,
+               batadv_dbg(BATADV_DBG_BLA, bat_priv,
                           "bla_send_claim(): UNCLAIM %pM on vid %d\n", mac,
                           vid);
                break;
-       case CLAIM_TYPE_ANNOUNCE:
+       case BATADV_CLAIM_TYPE_ANNOUNCE:
                /* announcement frame
                 * set HW SRC to the special mac containg the crc
                 */
                memcpy(hw_src, mac, ETH_ALEN);
-               batadv_dbg(DBG_BLA, bat_priv,
+               batadv_dbg(BATADV_DBG_BLA, bat_priv,
                           "bla_send_claim(): ANNOUNCE of %pM on vid %d\n",
                           ethhdr->h_source, vid);
                break;
-       case CLAIM_TYPE_REQUEST:
+       case BATADV_CLAIM_TYPE_REQUEST:
                /* request frame
                 * set HW SRC to the special mac containg the crc
                 */
                memcpy(hw_src, mac, ETH_ALEN);
                memcpy(ethhdr->h_dest, mac, ETH_ALEN);
-               batadv_dbg(DBG_BLA, bat_priv,
+               batadv_dbg(BATADV_DBG_BLA, bat_priv,
                           "bla_send_claim(): REQUEST of %pM to %pMon vid %d\n",
                           ethhdr->h_source, ethhdr->h_dest, vid);
                break;
@@ -350,19 +355,20 @@ out:
  * searches for the backbone gw or creates a new one if it could not
  * be found.
  */
-static struct backbone_gw *bla_get_backbone_gw(struct bat_priv *bat_priv,
-                                              uint8_t *orig, short vid)
+static struct batadv_backbone_gw *
+batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, uint8_t *orig,
+                          short vid)
 {
-       struct backbone_gw *entry;
-       struct orig_node *orig_node;
+       struct batadv_backbone_gw *entry;
+       struct batadv_orig_node *orig_node;
        int hash_added;
 
-       entry = backbone_hash_find(bat_priv, orig, vid);
+       entry = batadv_backbone_hash_find(bat_priv, orig, vid);
 
        if (entry)
                return entry;
 
-       batadv_dbg(DBG_BLA, bat_priv,
+       batadv_dbg(BATADV_DBG_BLA, bat_priv,
                   "bla_get_backbone_gw(): not found (%pM, %d), creating new entry\n",
                   orig, vid);
 
@@ -372,7 +378,7 @@ static struct backbone_gw *bla_get_backbone_gw(struct bat_priv *bat_priv,
 
        entry->vid = vid;
        entry->lasttime = jiffies;
-       entry->crc = BLA_CRC_INIT;
+       entry->crc = BATADV_BLA_CRC_INIT;
        entry->bat_priv = bat_priv;
        atomic_set(&entry->request_sent, 0);
        memcpy(entry->orig, orig, ETH_ALEN);
@@ -381,8 +387,9 @@ static struct backbone_gw *bla_get_backbone_gw(struct bat_priv *bat_priv,
        atomic_set(&entry->refcount, 2);
 
        hash_added = batadv_hash_add(bat_priv->backbone_hash,
-                                    compare_backbone_gw, choose_backbone_gw,
-                                    entry, &entry->hash_entry);
+                                    batadv_compare_backbone_gw,
+                                    batadv_choose_backbone_gw, entry,
+                                    &entry->hash_entry);
 
        if (unlikely(hash_added != 0)) {
                /* hash failed, free the structure */
@@ -403,19 +410,21 @@ static struct backbone_gw *bla_get_backbone_gw(struct bat_priv *bat_priv,
 /* update or add the own backbone gw to make sure we announce
  * where we receive other backbone gws
  */
-static void bla_update_own_backbone_gw(struct bat_priv *bat_priv,
-                                      struct hard_iface *primary_if,
-                                      short vid)
+static void
+batadv_bla_update_own_backbone_gw(struct batadv_priv *bat_priv,
+                                 struct batadv_hard_iface *primary_if,
+                                 short vid)
 {
-       struct backbone_gw *backbone_gw;
+       struct batadv_backbone_gw *backbone_gw;
 
-       backbone_gw = bla_get_backbone_gw(bat_priv,
-                                         primary_if->net_dev->dev_addr, vid);
+       backbone_gw = batadv_bla_get_backbone_gw(bat_priv,
+                                                primary_if->net_dev->dev_addr,
+                                                vid);
        if (unlikely(!backbone_gw))
                return;
 
        backbone_gw->lasttime = jiffies;
-       backbone_gw_free_ref(backbone_gw);
+       batadv_backbone_gw_free_ref(backbone_gw);
 }
 
 /* @bat_priv: the bat priv with all the soft interface information
@@ -424,21 +433,23 @@ static void bla_update_own_backbone_gw(struct bat_priv *bat_priv,
  * Repeat all of our own claims, and finally send an ANNOUNCE frame
  * to allow the requester another check if the CRC is correct now.
  */
-static void bla_answer_request(struct bat_priv *bat_priv,
-                              struct hard_iface *primary_if, short vid)
+static void batadv_bla_answer_request(struct batadv_priv *bat_priv,
+                                     struct batadv_hard_iface *primary_if,
+                                     short vid)
 {
        struct hlist_node *node;
        struct hlist_head *head;
-       struct hashtable_t *hash;
-       struct claim *claim;
-       struct backbone_gw *backbone_gw;
+       struct batadv_hashtable *hash;
+       struct batadv_claim *claim;
+       struct batadv_backbone_gw *backbone_gw;
        int i;
 
-       batadv_dbg(DBG_BLA, bat_priv,
+       batadv_dbg(BATADV_DBG_BLA, bat_priv,
                   "bla_answer_request(): received a claim request, send all of our own claims again\n");
 
-       backbone_gw = backbone_hash_find(bat_priv,
-                                        primary_if->net_dev->dev_addr, vid);
+       backbone_gw = batadv_backbone_hash_find(bat_priv,
+                                               primary_if->net_dev->dev_addr,
+                                               vid);
        if (!backbone_gw)
                return;
 
@@ -452,15 +463,15 @@ static void bla_answer_request(struct bat_priv *bat_priv,
                        if (claim->backbone_gw != backbone_gw)
                                continue;
 
-                       bla_send_claim(bat_priv, claim->addr, claim->vid,
-                                      CLAIM_TYPE_ADD);
+                       batadv_bla_send_claim(bat_priv, claim->addr, claim->vid,
+                                             BATADV_CLAIM_TYPE_ADD);
                }
                rcu_read_unlock();
        }
 
        /* finally, send an announcement frame */
-       bla_send_announce(bat_priv, backbone_gw);
-       backbone_gw_free_ref(backbone_gw);
+       batadv_bla_send_announce(bat_priv, backbone_gw);
+       batadv_backbone_gw_free_ref(backbone_gw);
 }
 
 /* @backbone_gw: the backbone gateway from whom we are out of sync
@@ -469,17 +480,17 @@ static void bla_answer_request(struct bat_priv *bat_priv,
  * After the request, it will repeat all of his own claims and finally
  * send an announcement claim with which we can check again.
  */
-static void bla_send_request(struct backbone_gw *backbone_gw)
+static void batadv_bla_send_request(struct batadv_backbone_gw *backbone_gw)
 {
        /* first, remove all old entries */
-       bla_del_backbone_claims(backbone_gw);
+       batadv_bla_del_backbone_claims(backbone_gw);
 
-       batadv_dbg(DBG_BLA, backbone_gw->bat_priv, "Sending REQUEST to %pM\n",
-                  backbone_gw->orig);
+       batadv_dbg(BATADV_DBG_BLA, backbone_gw->bat_priv,
+                  "Sending REQUEST to %pM\n", backbone_gw->orig);
 
        /* send request */
-       bla_send_claim(backbone_gw->bat_priv, backbone_gw->orig,
-                      backbone_gw->vid, CLAIM_TYPE_REQUEST);
+       batadv_bla_send_claim(backbone_gw->bat_priv, backbone_gw->orig,
+                             backbone_gw->vid, BATADV_CLAIM_TYPE_REQUEST);
 
        /* no local broadcasts should be sent or received, for now. */
        if (!atomic_read(&backbone_gw->request_sent)) {
@@ -494,17 +505,18 @@ static void bla_send_request(struct backbone_gw *backbone_gw)
  * This function sends an announcement. It is called from multiple
  * places.
  */
-static void bla_send_announce(struct bat_priv *bat_priv,
-                             struct backbone_gw *backbone_gw)
+static void batadv_bla_send_announce(struct batadv_priv *bat_priv,
+                                    struct batadv_backbone_gw *backbone_gw)
 {
        uint8_t mac[ETH_ALEN];
        __be16 crc;
 
-       memcpy(mac, announce_mac, 4);
+       memcpy(mac, batadv_announce_mac, 4);
        crc = htons(backbone_gw->crc);
        memcpy(&mac[4], &crc, 2);
 
-       bla_send_claim(bat_priv, mac, backbone_gw->vid, CLAIM_TYPE_ANNOUNCE);
+       batadv_bla_send_claim(bat_priv, mac, backbone_gw->vid,
+                             BATADV_CLAIM_TYPE_ANNOUNCE);
 
 }
 
@@ -515,16 +527,17 @@ static void bla_send_announce(struct bat_priv *bat_priv,
  *
  * Adds a claim in the claim hash.
  */
-static void bla_add_claim(struct bat_priv *bat_priv, const uint8_t *mac,
-                         const short vid, struct backbone_gw *backbone_gw)
+static void batadv_bla_add_claim(struct batadv_priv *bat_priv,
+                                const uint8_t *mac, const short vid,
+                                struct batadv_backbone_gw *backbone_gw)
 {
-       struct claim *claim;
-       struct claim search_claim;
+       struct batadv_claim *claim;
+       struct batadv_claim search_claim;
        int hash_added;
 
        memcpy(search_claim.addr, mac, ETH_ALEN);
        search_claim.vid = vid;
-       claim = claim_hash_find(bat_priv, &search_claim);
+       claim = batadv_claim_hash_find(bat_priv, &search_claim);
 
        /* create a new claim entry if it does not exist yet. */
        if (!claim) {
@@ -538,12 +551,13 @@ static void bla_add_claim(struct bat_priv *bat_priv, const uint8_t *mac,
                claim->backbone_gw = backbone_gw;
 
                atomic_set(&claim->refcount, 2);
-               batadv_dbg(DBG_BLA, bat_priv,
+               batadv_dbg(BATADV_DBG_BLA, bat_priv,
                           "bla_add_claim(): adding new entry %pM, vid %d to hash ...\n",
                           mac, vid);
                hash_added = batadv_hash_add(bat_priv->claim_hash,
-                                            compare_claim, choose_claim,
-                                            claim, &claim->hash_entry);
+                                            batadv_compare_claim,
+                                            batadv_choose_claim, claim,
+                                            &claim->hash_entry);
 
                if (unlikely(hash_added != 0)) {
                        /* only local changes happened. */
@@ -556,13 +570,13 @@ static void bla_add_claim(struct bat_priv *bat_priv, const uint8_t *mac,
                        /* no need to register a new backbone */
                        goto claim_free_ref;
 
-               batadv_dbg(DBG_BLA, bat_priv,
+               batadv_dbg(BATADV_DBG_BLA, bat_priv,
                           "bla_add_claim(): changing ownership for %pM, vid %d\n",
                           mac, vid);
 
                claim->backbone_gw->crc ^=
                        crc16(0, claim->addr, ETH_ALEN);
-               backbone_gw_free_ref(claim->backbone_gw);
+               batadv_backbone_gw_free_ref(claim->backbone_gw);
 
        }
        /* set (new) backbone gw */
@@ -573,47 +587,48 @@ static void bla_add_claim(struct bat_priv *bat_priv, const uint8_t *mac,
        backbone_gw->lasttime = jiffies;
 
 claim_free_ref:
-       claim_free_ref(claim);
+       batadv_claim_free_ref(claim);
 }
 
 /* Delete a claim from the claim hash which has the
  * given mac address and vid.
  */
-static void bla_del_claim(struct bat_priv *bat_priv, const uint8_t *mac,
-                         const short vid)
+static void batadv_bla_del_claim(struct batadv_priv *bat_priv,
+                                const uint8_t *mac, const short vid)
 {
-       struct claim search_claim, *claim;
+       struct batadv_claim search_claim, *claim;
 
        memcpy(search_claim.addr, mac, ETH_ALEN);
        search_claim.vid = vid;
-       claim = claim_hash_find(bat_priv, &search_claim);
+       claim = batadv_claim_hash_find(bat_priv, &search_claim);
        if (!claim)
                return;
 
-       batadv_dbg(DBG_BLA, bat_priv, "bla_del_claim(): %pM, vid %d\n", mac,
-                  vid);
+       batadv_dbg(BATADV_DBG_BLA, bat_priv, "bla_del_claim(): %pM, vid %d\n",
+                  mac, vid);
 
-       batadv_hash_remove(bat_priv->claim_hash, compare_claim, choose_claim,
-                          claim);
-       claim_free_ref(claim); /* reference from the hash is gone */
+       batadv_hash_remove(bat_priv->claim_hash, batadv_compare_claim,
+                          batadv_choose_claim, claim);
+       batadv_claim_free_ref(claim); /* reference from the hash is gone */
 
        claim->backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN);
 
        /* don't need the reference from hash_find() anymore */
-       claim_free_ref(claim);
+       batadv_claim_free_ref(claim);
 }
 
 /* check for ANNOUNCE frame, return 1 if handled */
-static int handle_announce(struct bat_priv *bat_priv,
-                          uint8_t *an_addr, uint8_t *backbone_addr, short vid)
+static int batadv_handle_announce(struct batadv_priv *bat_priv,
+                                 uint8_t *an_addr, uint8_t *backbone_addr,
+                                 short vid)
 {
-       struct backbone_gw *backbone_gw;
+       struct batadv_backbone_gw *backbone_gw;
        uint16_t crc;
 
-       if (memcmp(an_addr, announce_mac, 4) != 0)
+       if (memcmp(an_addr, batadv_announce_mac, 4) != 0)
                return 0;
 
-       backbone_gw = bla_get_backbone_gw(bat_priv, backbone_addr, vid);
+       backbone_gw = batadv_bla_get_backbone_gw(bat_priv, backbone_addr, vid);
 
        if (unlikely(!backbone_gw))
                return 1;
@@ -623,17 +638,17 @@ static int handle_announce(struct bat_priv *bat_priv,
        backbone_gw->lasttime = jiffies;
        crc = ntohs(*((__be16 *)(&an_addr[4])));
 
-       batadv_dbg(DBG_BLA, bat_priv,
+       batadv_dbg(BATADV_DBG_BLA, bat_priv,
                   "handle_announce(): ANNOUNCE vid %d (sent by %pM)... CRC = %04x\n",
                   vid, backbone_gw->orig, crc);
 
        if (backbone_gw->crc != crc) {
-               batadv_dbg(DBG_BLA, backbone_gw->bat_priv,
+               batadv_dbg(BATADV_DBG_BLA, backbone_gw->bat_priv,
                           "handle_announce(): CRC FAILED for %pM/%d (my = %04x, sent = %04x)\n",
                           backbone_gw->orig, backbone_gw->vid,
                           backbone_gw->crc, crc);
 
-               bla_send_request(backbone_gw);
+               batadv_bla_send_request(backbone_gw);
        } else {
                /* if we have sent a request and the crc was OK,
                 * we can allow traffic again.
@@ -644,15 +659,15 @@ static int handle_announce(struct bat_priv *bat_priv,
                }
        }
 
-       backbone_gw_free_ref(backbone_gw);
+       batadv_backbone_gw_free_ref(backbone_gw);
        return 1;
 }
 
 /* check for REQUEST frame, return 1 if handled */
-static int handle_request(struct bat_priv *bat_priv,
-                         struct hard_iface *primary_if,
-                         uint8_t *backbone_addr,
-                         struct ethhdr *ethhdr, short vid)
+static int batadv_handle_request(struct batadv_priv *bat_priv,
+                                struct batadv_hard_iface *primary_if,
+                                uint8_t *backbone_addr,
+                                struct ethhdr *ethhdr, short vid)
 {
        /* check for REQUEST frame */
        if (!batadv_compare_eth(backbone_addr, ethhdr->h_dest))
@@ -664,64 +679,67 @@ static int handle_request(struct bat_priv *bat_priv,
        if (!batadv_compare_eth(ethhdr->h_dest, primary_if->net_dev->dev_addr))
                return 1;
 
-       batadv_dbg(DBG_BLA, bat_priv,
+       batadv_dbg(BATADV_DBG_BLA, bat_priv,
                   "handle_request(): REQUEST vid %d (sent by %pM)...\n",
                   vid, ethhdr->h_source);
 
-       bla_answer_request(bat_priv, primary_if, vid);
+       batadv_bla_answer_request(bat_priv, primary_if, vid);
        return 1;
 }
 
 /* check for UNCLAIM frame, return 1 if handled */
-static int handle_unclaim(struct bat_priv *bat_priv,
-                         struct hard_iface *primary_if,
-                         uint8_t *backbone_addr,
-                         uint8_t *claim_addr, short vid)
+static int batadv_handle_unclaim(struct batadv_priv *bat_priv,
+                                struct batadv_hard_iface *primary_if,
+                                uint8_t *backbone_addr,
+                                uint8_t *claim_addr, short vid)
 {
-       struct backbone_gw *backbone_gw;
+       struct batadv_backbone_gw *backbone_gw;
 
        /* unclaim in any case if it is our own */
        if (primary_if && batadv_compare_eth(backbone_addr,
                                             primary_if->net_dev->dev_addr))
-               bla_send_claim(bat_priv, claim_addr, vid, CLAIM_TYPE_DEL);
+               batadv_bla_send_claim(bat_priv, claim_addr, vid,
+                                     BATADV_CLAIM_TYPE_DEL);
 
-       backbone_gw = backbone_hash_find(bat_priv, backbone_addr, vid);
+       backbone_gw = batadv_backbone_hash_find(bat_priv, backbone_addr, vid);
 
        if (!backbone_gw)
                return 1;
 
        /* this must be an UNCLAIM frame */
-       batadv_dbg(DBG_BLA, bat_priv,
+       batadv_dbg(BATADV_DBG_BLA, bat_priv,
                   "handle_unclaim(): UNCLAIM %pM on vid %d (sent by %pM)...\n",
                   claim_addr, vid, backbone_gw->orig);
 
-       bla_del_claim(bat_priv, claim_addr, vid);
-       backbone_gw_free_ref(backbone_gw);
+       batadv_bla_del_claim(bat_priv, claim_addr, vid);
+       batadv_backbone_gw_free_ref(backbone_gw);
        return 1;
 }
 
 /* check for CLAIM frame, return 1 if handled */
-static int handle_claim(struct bat_priv *bat_priv,
-                       struct hard_iface *primary_if, uint8_t *backbone_addr,
-                       uint8_t *claim_addr, short vid)
+static int batadv_handle_claim(struct batadv_priv *bat_priv,
+                              struct batadv_hard_iface *primary_if,
+                              uint8_t *backbone_addr, uint8_t *claim_addr,
+                              short vid)
 {
-       struct backbone_gw *backbone_gw;
+       struct batadv_backbone_gw *backbone_gw;
 
        /* register the gateway if not yet available, and add the claim. */
 
-       backbone_gw = bla_get_backbone_gw(bat_priv, backbone_addr, vid);
+       backbone_gw = batadv_bla_get_backbone_gw(bat_priv, backbone_addr, vid);
 
        if (unlikely(!backbone_gw))
                return 1;
 
        /* this must be a CLAIM frame */
-       bla_add_claim(bat_priv, claim_addr, vid, backbone_gw);
+       batadv_bla_add_claim(bat_priv, claim_addr, vid, backbone_gw);
        if (batadv_compare_eth(backbone_addr, primary_if->net_dev->dev_addr))
-               bla_send_claim(bat_priv, claim_addr, vid, CLAIM_TYPE_ADD);
+               batadv_bla_send_claim(bat_priv, claim_addr, vid,
+                                     BATADV_CLAIM_TYPE_ADD);
 
        /* TODO: we could call something like tt_local_del() here. */
 
-       backbone_gw_free_ref(backbone_gw);
+       batadv_backbone_gw_free_ref(backbone_gw);
        return 1;
 }
 
@@ -739,16 +757,16 @@ static int handle_claim(struct bat_priv *bat_priv,
  *     1  - if is a claim packet from another group
  *     0  - if it is not a claim packet
  */
-static int check_claim_group(struct bat_priv *bat_priv,
-                            struct hard_iface *primary_if,
-                            uint8_t *hw_src, uint8_t *hw_dst,
-                            struct ethhdr *ethhdr)
+static int batadv_check_claim_group(struct batadv_priv *bat_priv,
+                                   struct batadv_hard_iface *primary_if,
+                                   uint8_t *hw_src, uint8_t *hw_dst,
+                                   struct ethhdr *ethhdr)
 {
        uint8_t *backbone_addr;
-       struct orig_node *orig_node;
-       struct bla_claim_dst *bla_dst, *bla_dst_own;
+       struct batadv_orig_node *orig_node;
+       struct batadv_bla_claim_dst *bla_dst, *bla_dst_own;
 
-       bla_dst = (struct bla_claim_dst *)hw_dst;
+       bla_dst = (struct batadv_bla_claim_dst *)hw_dst;
        bla_dst_own = &bat_priv->claim_dest;
 
        /* check if it is a claim packet in general */
@@ -760,12 +778,12 @@ static int check_claim_group(struct bat_priv *bat_priv,
         * otherwise assume it is in the hw_src
         */
        switch (bla_dst->type) {
-       case CLAIM_TYPE_ADD:
+       case BATADV_CLAIM_TYPE_ADD:
                backbone_addr = hw_src;
                break;
-       case CLAIM_TYPE_REQUEST:
-       case CLAIM_TYPE_ANNOUNCE:
-       case CLAIM_TYPE_DEL:
+       case BATADV_CLAIM_TYPE_REQUEST:
+       case BATADV_CLAIM_TYPE_ANNOUNCE:
+       case BATADV_CLAIM_TYPE_DEL:
                backbone_addr = ethhdr->h_source;
                break;
        default:
@@ -791,7 +809,7 @@ static int check_claim_group(struct bat_priv *bat_priv,
 
        /* if our mesh friends mac is bigger, use it for ourselves. */
        if (ntohs(bla_dst->group) > ntohs(bla_dst_own->group)) {
-               batadv_dbg(DBG_BLA, bat_priv,
+               batadv_dbg(BATADV_DBG_BLA, bat_priv,
                           "taking other backbones claim group: %04x\n",
                           ntohs(bla_dst->group));
                bla_dst_own->group = bla_dst->group;
@@ -811,15 +829,15 @@ static int check_claim_group(struct bat_priv *bat_priv,
  * returns 1 if it was a claim frame, otherwise return 0 to
  * tell the callee that it can use the frame on its own.
  */
-static int bla_process_claim(struct bat_priv *bat_priv,
-                            struct hard_iface *primary_if,
-                            struct sk_buff *skb)
+static int batadv_bla_process_claim(struct batadv_priv *bat_priv,
+                                   struct batadv_hard_iface *primary_if,
+                                   struct sk_buff *skb)
 {
        struct ethhdr *ethhdr;
        struct vlan_ethhdr *vhdr;
        struct arphdr *arphdr;
        uint8_t *hw_src, *hw_dst;
-       struct bla_claim_dst *bla_dst;
+       struct batadv_bla_claim_dst *bla_dst;
        uint16_t proto;
        int headlen;
        short vid = -1;
@@ -863,12 +881,13 @@ static int bla_process_claim(struct bat_priv *bat_priv,
 
        hw_src = (uint8_t *)arphdr + sizeof(struct arphdr);
        hw_dst = hw_src + ETH_ALEN + 4;
-       bla_dst = (struct bla_claim_dst *)hw_dst;
+       bla_dst = (struct batadv_bla_claim_dst *)hw_dst;
 
        /* check if it is a claim frame. */
-       ret = check_claim_group(bat_priv, primary_if, hw_src, hw_dst, ethhdr);
+       ret = batadv_check_claim_group(bat_priv, primary_if, hw_src, hw_dst,
+                                      ethhdr);
        if (ret == 1)
-               batadv_dbg(DBG_BLA, bat_priv,
+               batadv_dbg(BATADV_DBG_BLA, bat_priv,
                           "bla_process_claim(): received a claim frame from another group. From: %pM on vid %d ...(hw_src %pM, hw_dst %pM)\n",
                           ethhdr->h_source, vid, hw_src, hw_dst);
 
@@ -876,32 +895,34 @@ static int bla_process_claim(struct bat_priv *bat_priv,
                return ret;
 
        /* become a backbone gw ourselves on this vlan if not happened yet */
-       bla_update_own_backbone_gw(bat_priv, primary_if, vid);
+       batadv_bla_update_own_backbone_gw(bat_priv, primary_if, vid);
 
        /* check for the different types of claim frames ... */
        switch (bla_dst->type) {
-       case CLAIM_TYPE_ADD:
-               if (handle_claim(bat_priv, primary_if, hw_src,
-                                ethhdr->h_source, vid))
+       case BATADV_CLAIM_TYPE_ADD:
+               if (batadv_handle_claim(bat_priv, primary_if, hw_src,
+                                       ethhdr->h_source, vid))
                        return 1;
                break;
-       case CLAIM_TYPE_DEL:
-               if (handle_unclaim(bat_priv, primary_if,
-                                  ethhdr->h_source, hw_src, vid))
+       case BATADV_CLAIM_TYPE_DEL:
+               if (batadv_handle_unclaim(bat_priv, primary_if,
+                                         ethhdr->h_source, hw_src, vid))
                        return 1;
                break;
 
-       case CLAIM_TYPE_ANNOUNCE:
-               if (handle_announce(bat_priv, hw_src, ethhdr->h_source, vid))
+       case BATADV_CLAIM_TYPE_ANNOUNCE:
+               if (batadv_handle_announce(bat_priv, hw_src, ethhdr->h_source,
+                                          vid))
                        return 1;
                break;
-       case CLAIM_TYPE_REQUEST:
-               if (handle_request(bat_priv, primary_if, hw_src, ethhdr, vid))
+       case BATADV_CLAIM_TYPE_REQUEST:
+               if (batadv_handle_request(bat_priv, primary_if, hw_src, ethhdr,
+                                         vid))
                        return 1;
                break;
        }
 
-       batadv_dbg(DBG_BLA, bat_priv,
+       batadv_dbg(BATADV_DBG_BLA, bat_priv,
                   "bla_process_claim(): ERROR - this looks like a claim frame, but is useless. eth src %pM on vid %d ...(hw_src %pM, hw_dst %pM)\n",
                   ethhdr->h_source, vid, hw_src, hw_dst);
        return 1;
@@ -910,12 +931,12 @@ static int bla_process_claim(struct bat_priv *bat_priv,
 /* Check when we last heard from other nodes, and remove them in case of
  * a time out, or clean all backbone gws if now is set.
  */
-static void bla_purge_backbone_gw(struct bat_priv *bat_priv, int now)
+static void batadv_bla_purge_backbone_gw(struct batadv_priv *bat_priv, int now)
 {
-       struct backbone_gw *backbone_gw;
+       struct batadv_backbone_gw *backbone_gw;
        struct hlist_node *node, *node_tmp;
        struct hlist_head *head;
-       struct hashtable_t *hash;
+       struct batadv_hashtable *hash;
        spinlock_t *list_lock;  /* protects write access to the hash lists */
        int i;
 
@@ -933,10 +954,10 @@ static void bla_purge_backbone_gw(struct bat_priv *bat_priv, int now)
                        if (now)
                                goto purge_now;
                        if (!batadv_has_timed_out(backbone_gw->lasttime,
-                                                 BLA_BACKBONE_TIMEOUT))
+                                                 BATADV_BLA_BACKBONE_TIMEOUT))
                                continue;
 
-                       batadv_dbg(DBG_BLA, backbone_gw->bat_priv,
+                       batadv_dbg(BATADV_DBG_BLA, backbone_gw->bat_priv,
                                   "bla_purge_backbone_gw(): backbone gw %pM timed out\n",
                                   backbone_gw->orig);
 
@@ -945,10 +966,10 @@ purge_now:
                        if (atomic_read(&backbone_gw->request_sent))
                                atomic_dec(&bat_priv->bla_num_requests);
 
-                       bla_del_backbone_claims(backbone_gw);
+                       batadv_bla_del_backbone_claims(backbone_gw);
 
                        hlist_del_rcu(node);
-                       backbone_gw_free_ref(backbone_gw);
+                       batadv_backbone_gw_free_ref(backbone_gw);
                }
                spin_unlock_bh(list_lock);
        }
@@ -961,13 +982,14 @@ purge_now:
  * Check when we heard last time from our own claims, and remove them in case of
  * a time out, or clean all claims if now is set
  */
-static void bla_purge_claims(struct bat_priv *bat_priv,
-                            struct hard_iface *primary_if, int now)
+static void batadv_bla_purge_claims(struct batadv_priv *bat_priv,
+                                   struct batadv_hard_iface *primary_if,
+                                   int now)
 {
-       struct claim *claim;
+       struct batadv_claim *claim;
        struct hlist_node *node;
        struct hlist_head *head;
-       struct hashtable_t *hash;
+       struct batadv_hashtable *hash;
        int i;
 
        hash = bat_priv->claim_hash;
@@ -985,17 +1007,17 @@ static void bla_purge_claims(struct bat_priv *bat_priv,
                                                primary_if->net_dev->dev_addr))
                                continue;
                        if (!batadv_has_timed_out(claim->lasttime,
-                                                 BLA_CLAIM_TIMEOUT))
+                                                 BATADV_BLA_CLAIM_TIMEOUT))
                                continue;
 
-                       batadv_dbg(DBG_BLA, bat_priv,
+                       batadv_dbg(BATADV_DBG_BLA, bat_priv,
                                   "bla_purge_claims(): %pM, vid %d, time out\n",
                                   claim->addr, claim->vid);
 
 purge_now:
-                       handle_unclaim(bat_priv, primary_if,
-                                      claim->backbone_gw->orig,
-                                      claim->addr, claim->vid);
+                       batadv_handle_unclaim(bat_priv, primary_if,
+                                             claim->backbone_gw->orig,
+                                             claim->addr, claim->vid);
                }
                rcu_read_unlock();
        }
@@ -1007,14 +1029,14 @@ purge_now:
  *
  * Update the backbone gateways when the own orig address changes.
  */
-void batadv_bla_update_orig_address(struct bat_priv *bat_priv,
-                                   struct hard_iface *primary_if,
-                                   struct hard_iface *oldif)
+void batadv_bla_update_orig_address(struct batadv_priv *bat_priv,
+                                   struct batadv_hard_iface *primary_if,
+                                   struct batadv_hard_iface *oldif)
 {
-       struct backbone_gw *backbone_gw;
+       struct batadv_backbone_gw *backbone_gw;
        struct hlist_node *node;
        struct hlist_head *head;
-       struct hashtable_t *hash;
+       struct batadv_hashtable *hash;
        int i;
 
        /* reset bridge loop avoidance group id */
@@ -1022,8 +1044,8 @@ void batadv_bla_update_orig_address(struct bat_priv *bat_priv,
                htons(crc16(0, primary_if->net_dev->dev_addr, ETH_ALEN));
 
        if (!oldif) {
-               bla_purge_claims(bat_priv, NULL, 1);
-               bla_purge_backbone_gw(bat_priv, 1);
+               batadv_bla_purge_claims(bat_priv, NULL, 1);
+               batadv_bla_purge_backbone_gw(bat_priv, 1);
                return;
        }
 
@@ -1046,7 +1068,7 @@ void batadv_bla_update_orig_address(struct bat_priv *bat_priv,
                        /* send an announce frame so others will ask for our
                         * claims and update their tables.
                         */
-                       bla_send_announce(bat_priv, backbone_gw);
+                       batadv_bla_send_announce(bat_priv, backbone_gw);
                }
                rcu_read_unlock();
        }
@@ -1055,36 +1077,36 @@ void batadv_bla_update_orig_address(struct bat_priv *bat_priv,
 
 
 /* (re)start the timer */
-static void bla_start_timer(struct bat_priv *bat_priv)
+static void batadv_bla_start_timer(struct batadv_priv *bat_priv)
 {
-       INIT_DELAYED_WORK(&bat_priv->bla_work, bla_periodic_work);
+       INIT_DELAYED_WORK(&bat_priv->bla_work, batadv_bla_periodic_work);
        queue_delayed_work(batadv_event_workqueue, &bat_priv->bla_work,
-                          msecs_to_jiffies(BLA_PERIOD_LENGTH));
+                          msecs_to_jiffies(BATADV_BLA_PERIOD_LENGTH));
 }
 
 /* periodic work to do:
  *  * purge structures when they are too old
  *  * send announcements
  */
-static void bla_periodic_work(struct work_struct *work)
+static void batadv_bla_periodic_work(struct work_struct *work)
 {
        struct delayed_work *delayed_work =
                container_of(work, struct delayed_work, work);
-       struct bat_priv *bat_priv =
-               container_of(delayed_work, struct bat_priv, bla_work);
+       struct batadv_priv *bat_priv;
        struct hlist_node *node;
        struct hlist_head *head;
-       struct backbone_gw *backbone_gw;
-       struct hashtable_t *hash;
-       struct hard_iface *primary_if;
+       struct batadv_backbone_gw *backbone_gw;
+       struct batadv_hashtable *hash;
+       struct batadv_hard_iface *primary_if;
        int i;
 
+       bat_priv = container_of(delayed_work, struct batadv_priv, bla_work);
        primary_if = batadv_primary_if_get_selected(bat_priv);
        if (!primary_if)
                goto out;
 
-       bla_purge_claims(bat_priv, primary_if, 0);
-       bla_purge_backbone_gw(bat_priv, 0);
+       batadv_bla_purge_claims(bat_priv, primary_if, 0);
+       batadv_bla_purge_backbone_gw(bat_priv, 0);
 
        if (!atomic_read(&bat_priv->bridge_loop_avoidance))
                goto out;
@@ -1104,7 +1126,7 @@ static void bla_periodic_work(struct work_struct *work)
 
                        backbone_gw->lasttime = jiffies;
 
-                       bla_send_announce(bat_priv, backbone_gw);
+                       batadv_bla_send_announce(bat_priv, backbone_gw);
                }
                rcu_read_unlock();
        }
@@ -1112,7 +1134,7 @@ out:
        if (primary_if)
                batadv_hardif_free_ref(primary_if);
 
-       bla_start_timer(bat_priv);
+       batadv_bla_start_timer(bat_priv);
 }
 
 /* The hash for claim and backbone hash receive the same key because they
@@ -1120,17 +1142,17 @@ out:
  * them with to different keys to allow nested locking without generating
  * lockdep warnings
  */
-static struct lock_class_key claim_hash_lock_class_key;
-static struct lock_class_key backbone_hash_lock_class_key;
+static struct lock_class_key batadv_claim_hash_lock_class_key;
+static struct lock_class_key batadv_backbone_hash_lock_class_key;
 
 /* initialize all bla structures */
-int batadv_bla_init(struct bat_priv *bat_priv)
+int batadv_bla_init(struct batadv_priv *bat_priv)
 {
        int i;
        uint8_t claim_dest[ETH_ALEN] = {0xff, 0x43, 0x05, 0x00, 0x00, 0x00};
-       struct hard_iface *primary_if;
+       struct batadv_hard_iface *primary_if;
 
-       batadv_dbg(DBG_BLA, bat_priv, "bla hash registering\n");
+       batadv_dbg(BATADV_DBG_BLA, bat_priv, "bla hash registering\n");
 
        /* setting claim destination address */
        memcpy(&bat_priv->claim_dest.magic, claim_dest, 3);
@@ -1146,9 +1168,9 @@ int batadv_bla_init(struct bat_priv *bat_priv)
        }
 
        /* initialize the duplicate list */
-       for (i = 0; i < DUPLIST_SIZE; i++)
+       for (i = 0; i < BATADV_DUPLIST_SIZE; i++)
                bat_priv->bcast_duplist[i].entrytime =
-                       jiffies - msecs_to_jiffies(DUPLIST_TIMEOUT);
+                       jiffies - msecs_to_jiffies(BATADV_DUPLIST_TIMEOUT);
        bat_priv->bcast_duplist_curr = 0;
 
        if (bat_priv->claim_hash)
@@ -1161,13 +1183,13 @@ int batadv_bla_init(struct bat_priv *bat_priv)
                return -ENOMEM;
 
        batadv_hash_set_lock_class(bat_priv->claim_hash,
-                                  &claim_hash_lock_class_key);
+                                  &batadv_claim_hash_lock_class_key);
        batadv_hash_set_lock_class(bat_priv->backbone_hash,
-                                  &backbone_hash_lock_class_key);
+                                  &batadv_backbone_hash_lock_class_key);
 
-       batadv_dbg(DBG_BLA, bat_priv, "bla hashes initialized\n");
+       batadv_dbg(BATADV_DBG_BLA, bat_priv, "bla hashes initialized\n");
 
-       bla_start_timer(bat_priv);
+       batadv_bla_start_timer(bat_priv);
        return 0;
 }
 
@@ -1184,14 +1206,14 @@ int batadv_bla_init(struct bat_priv *bat_priv)
  * sent by another host, drop it. We allow equal packets from
  * the same host however as this might be intended.
  */
-int batadv_bla_check_bcast_duplist(struct bat_priv *bat_priv,
-                                  struct bcast_packet *bcast_packet,
+int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv,
+                                  struct batadv_bcast_packet *bcast_packet,
                                   int hdr_size)
 {
        int i, length, curr;
        uint8_t *content;
        uint16_t crc;
-       struct bcast_duplist_entry *entry;
+       struct batadv_bcast_duplist_entry *entry;
 
        length = hdr_size - sizeof(*bcast_packet);
        content = (uint8_t *)bcast_packet;
@@ -1200,14 +1222,15 @@ int batadv_bla_check_bcast_duplist(struct bat_priv *bat_priv,
        /* calculate the crc ... */
        crc = crc16(0, content, length);
 
-       for (i = 0 ; i < DUPLIST_SIZE; i++) {
-               curr = (bat_priv->bcast_duplist_curr + i) % DUPLIST_SIZE;
+       for (i = 0; i < BATADV_DUPLIST_SIZE; i++) {
+               curr = (bat_priv->bcast_duplist_curr + i) % BATADV_DUPLIST_SIZE;
                entry = &bat_priv->bcast_duplist[curr];
 
                /* we can stop searching if the entry is too old ;
                 * later entries will be even older
                 */
-               if (batadv_has_timed_out(entry->entrytime, DUPLIST_TIMEOUT))
+               if (batadv_has_timed_out(entry->entrytime,
+                                        BATADV_DUPLIST_TIMEOUT))
                        break;
 
                if (entry->crc != crc)
@@ -1222,7 +1245,8 @@ int batadv_bla_check_bcast_duplist(struct bat_priv *bat_priv,
                return 1;
        }
        /* not found, add a new entry (overwrite the oldest entry) */
-       curr = (bat_priv->bcast_duplist_curr + DUPLIST_SIZE - 1) % DUPLIST_SIZE;
+       curr = (bat_priv->bcast_duplist_curr + BATADV_DUPLIST_SIZE - 1);
+       curr %= BATADV_DUPLIST_SIZE;
        entry = &bat_priv->bcast_duplist[curr];
        entry->crc = crc;
        entry->entrytime = jiffies;
@@ -1242,12 +1266,12 @@ int batadv_bla_check_bcast_duplist(struct bat_priv *bat_priv,
  *
  * returns 1 if it is found, 0 otherwise
  */
-int batadv_bla_is_backbone_gw_orig(struct bat_priv *bat_priv, uint8_t *orig)
+int batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, uint8_t *orig)
 {
-       struct hashtable_t *hash = bat_priv->backbone_hash;
+       struct batadv_hashtable *hash = bat_priv->backbone_hash;
        struct hlist_head *head;
        struct hlist_node *node;
-       struct backbone_gw *backbone_gw;
+       struct batadv_backbone_gw *backbone_gw;
        int i;
 
        if (!atomic_read(&bat_priv->bridge_loop_avoidance))
@@ -1282,11 +1306,11 @@ int batadv_bla_is_backbone_gw_orig(struct bat_priv *bat_priv, uint8_t *orig)
  * returns 0.
  */
 int batadv_bla_is_backbone_gw(struct sk_buff *skb,
-                             struct orig_node *orig_node, int hdr_size)
+                             struct batadv_orig_node *orig_node, int hdr_size)
 {
        struct ethhdr *ethhdr;
        struct vlan_ethhdr *vhdr;
-       struct backbone_gw *backbone_gw;
+       struct batadv_backbone_gw *backbone_gw;
        short vid = -1;
 
        if (!atomic_read(&orig_node->bat_priv->bridge_loop_avoidance))
@@ -1308,30 +1332,30 @@ int batadv_bla_is_backbone_gw(struct sk_buff *skb,
        }
 
        /* see if this originator is a backbone gw for this VLAN */
-       backbone_gw = backbone_hash_find(orig_node->bat_priv,
-                                        orig_node->orig, vid);
+       backbone_gw = batadv_backbone_hash_find(orig_node->bat_priv,
+                                               orig_node->orig, vid);
        if (!backbone_gw)
                return 0;
 
-       backbone_gw_free_ref(backbone_gw);
+       batadv_backbone_gw_free_ref(backbone_gw);
        return 1;
 }
 
 /* free all bla structures (for softinterface free or module unload) */
-void batadv_bla_free(struct bat_priv *bat_priv)
+void batadv_bla_free(struct batadv_priv *bat_priv)
 {
-       struct hard_iface *primary_if;
+       struct batadv_hard_iface *primary_if;
 
        cancel_delayed_work_sync(&bat_priv->bla_work);
        primary_if = batadv_primary_if_get_selected(bat_priv);
 
        if (bat_priv->claim_hash) {
-               bla_purge_claims(bat_priv, primary_if, 1);
+               batadv_bla_purge_claims(bat_priv, primary_if, 1);
                batadv_hash_destroy(bat_priv->claim_hash);
                bat_priv->claim_hash = NULL;
        }
        if (bat_priv->backbone_hash) {
-               bla_purge_backbone_gw(bat_priv, 1);
+               batadv_bla_purge_backbone_gw(bat_priv, 1);
                batadv_hash_destroy(bat_priv->backbone_hash);
                bat_priv->backbone_hash = NULL;
        }
@@ -1351,11 +1375,11 @@ void batadv_bla_free(struct bat_priv *bat_priv)
  * returns 1, otherwise it returns 0 and the caller shall further
  * process the skb.
  */
-int batadv_bla_rx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid)
+int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid)
 {
        struct ethhdr *ethhdr;
-       struct claim search_claim, *claim = NULL;
-       struct hard_iface *primary_if;
+       struct batadv_claim search_claim, *claim = NULL;
+       struct batadv_hard_iface *primary_if;
        int ret;
 
        ethhdr = (struct ethhdr *)skb_mac_header(skb);
@@ -1375,15 +1399,15 @@ int batadv_bla_rx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid)
 
        memcpy(search_claim.addr, ethhdr->h_source, ETH_ALEN);
        search_claim.vid = vid;
-       claim = claim_hash_find(bat_priv, &search_claim);
+       claim = batadv_claim_hash_find(bat_priv, &search_claim);
 
        if (!claim) {
                /* possible optimization: race for a claim */
                /* No claim exists yet, claim it for us!
                 */
-               handle_claim(bat_priv, primary_if,
-                            primary_if->net_dev->dev_addr,
-                            ethhdr->h_source, vid);
+               batadv_handle_claim(bat_priv, primary_if,
+                                   primary_if->net_dev->dev_addr,
+                                   ethhdr->h_source, vid);
                goto allow;
        }
 
@@ -1404,13 +1428,13 @@ int batadv_bla_rx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid)
                 * send a claim and update the claim table
                 * immediately.
                 */
-               handle_claim(bat_priv, primary_if,
-                            primary_if->net_dev->dev_addr,
-                            ethhdr->h_source, vid);
+               batadv_handle_claim(bat_priv, primary_if,
+                                   primary_if->net_dev->dev_addr,
+                                   ethhdr->h_source, vid);
                goto allow;
        }
 allow:
-       bla_update_own_backbone_gw(bat_priv, primary_if, vid);
+       batadv_bla_update_own_backbone_gw(bat_priv, primary_if, vid);
        ret = 0;
        goto out;
 
@@ -1422,7 +1446,7 @@ out:
        if (primary_if)
                batadv_hardif_free_ref(primary_if);
        if (claim)
-               claim_free_ref(claim);
+               batadv_claim_free_ref(claim);
        return ret;
 }
 
@@ -1438,11 +1462,11 @@ out:
  * returns 1, otherwise it returns 0 and the caller shall further
  * process the skb.
  */
-int batadv_bla_tx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid)
+int batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid)
 {
        struct ethhdr *ethhdr;
-       struct claim search_claim, *claim = NULL;
-       struct hard_iface *primary_if;
+       struct batadv_claim search_claim, *claim = NULL;
+       struct batadv_hard_iface *primary_if;
        int ret = 0;
 
        primary_if = batadv_primary_if_get_selected(bat_priv);
@@ -1455,7 +1479,7 @@ int batadv_bla_tx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid)
        /* in VLAN case, the mac header might not be set. */
        skb_reset_mac_header(skb);
 
-       if (bla_process_claim(bat_priv, primary_if, skb))
+       if (batadv_bla_process_claim(bat_priv, primary_if, skb))
                goto handled;
 
        ethhdr = (struct ethhdr *)skb_mac_header(skb);
@@ -1468,7 +1492,7 @@ int batadv_bla_tx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid)
        memcpy(search_claim.addr, ethhdr->h_source, ETH_ALEN);
        search_claim.vid = vid;
 
-       claim = claim_hash_find(bat_priv, &search_claim);
+       claim = batadv_claim_hash_find(bat_priv, &search_claim);
 
        /* if no claim exists, allow it. */
        if (!claim)
@@ -1480,9 +1504,9 @@ int batadv_bla_tx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid)
                /* if yes, the client has roamed and we have
                 * to unclaim it.
                 */
-               handle_unclaim(bat_priv, primary_if,
-                              primary_if->net_dev->dev_addr,
-                              ethhdr->h_source, vid);
+               batadv_handle_unclaim(bat_priv, primary_if,
+                                     primary_if->net_dev->dev_addr,
+                                     ethhdr->h_source, vid);
                goto allow;
        }
 
@@ -1499,7 +1523,7 @@ int batadv_bla_tx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid)
                goto allow;
        }
 allow:
-       bla_update_own_backbone_gw(bat_priv, primary_if, vid);
+       batadv_bla_update_own_backbone_gw(bat_priv, primary_if, vid);
        ret = 0;
        goto out;
 handled:
@@ -1508,17 +1532,17 @@ out:
        if (primary_if)
                batadv_hardif_free_ref(primary_if);
        if (claim)
-               claim_free_ref(claim);
+               batadv_claim_free_ref(claim);
        return ret;
 }
 
 int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset)
 {
        struct net_device *net_dev = (struct net_device *)seq->private;
-       struct bat_priv *bat_priv = netdev_priv(net_dev);
-       struct hashtable_t *hash = bat_priv->claim_hash;
-       struct claim *claim;
-       struct hard_iface *primary_if;
+       struct batadv_priv *bat_priv = netdev_priv(net_dev);
+       struct batadv_hashtable *hash = bat_priv->claim_hash;
+       struct batadv_claim *claim;
+       struct batadv_hard_iface *primary_if;
        struct hlist_node *node;
        struct hlist_head *head;
        uint32_t i;
@@ -1534,7 +1558,7 @@ int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset)
                goto out;
        }
 
-       if (primary_if->if_status != IF_ACTIVE) {
+       if (primary_if->if_status != BATADV_IF_ACTIVE) {
                ret = seq_printf(seq,
                                 "BATMAN mesh %s disabled - primary interface not active\n",
                                 net_dev->name);