1 files changed, 128 insertions, 122 deletions

diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
index 41147942ba53..f04f591f4668 100644
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
@@ -16,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #include "main.h"
@@ -30,48 +28,48 @@
 #include "soft-interface.h"
 #include "bridge_loop_avoidance.h"
 
-static void purge_orig(struct work_struct *work);
+static void batadv_purge_orig(struct work_struct *work);
 
-static void start_purge_timer(struct bat_priv *bat_priv)
+static void batadv_start_purge_timer(struct bat_priv *bat_priv)
 {
-        INIT_DELAYED_WORK(&bat_priv->orig_work, purge_orig);
-        queue_delayed_work(bat_event_workqueue,
+        INIT_DELAYED_WORK(&bat_priv->orig_work, batadv_purge_orig);
+        queue_delayed_work(batadv_event_workqueue,
                            &bat_priv->orig_work, msecs_to_jiffies(1000));
 }
 
 /* returns 1 if they are the same originator */
-static int compare_orig(const struct hlist_node *node, const void *data2)
+static int batadv_compare_orig(const struct hlist_node *node, const void *data2)
 {
         const void *data1 = container_of(node, struct orig_node, hash_entry);
 
         return (memcmp(data1, data2, ETH_ALEN) == 0 ? 1 : 0);
 }
 
-int originator_init(struct bat_priv *bat_priv)
+int batadv_originator_init(struct bat_priv *bat_priv)
 {
         if (bat_priv->orig_hash)
-                return 1;
+                return 0;
 
-        bat_priv->orig_hash = hash_new(1024);
+        bat_priv->orig_hash = batadv_hash_new(1024);
 
         if (!bat_priv->orig_hash)
                 goto err;
 
-        start_purge_timer(bat_priv);
-        return 1;
+        batadv_start_purge_timer(bat_priv);
+        return 0;
 
 err:
-        return 0;
+        return -ENOMEM;
 }
 
-void neigh_node_free_ref(struct neigh_node *neigh_node)
+void batadv_neigh_node_free_ref(struct neigh_node *neigh_node)
 {
         if (atomic_dec_and_test(&neigh_node->refcount))
                 kfree_rcu(neigh_node, rcu);
 }
 
 /* increases the refcounter of a found router */
-struct neigh_node *orig_node_get_router(struct orig_node *orig_node)
+struct neigh_node *batadv_orig_node_get_router(struct orig_node *orig_node)
 {
         struct neigh_node *router;
 
@@ -104,15 +102,15 @@ struct neigh_node *batadv_neigh_node_new(struct hard_iface *hard_iface,
         /* extra reference for return */
         atomic_set(&neigh_node->refcount, 2);
 
-        bat_dbg(DBG_BATMAN, bat_priv,
-                "Creating new neighbor %pM, initial seqno %d\n",
-                neigh_addr, seqno);
+        batadv_dbg(DBG_BATMAN, bat_priv,
+                   "Creating new neighbor %pM, initial seqno %d\n",
+                   neigh_addr, seqno);
 
 out:
         return neigh_node;
 }
 
-static void orig_node_free_rcu(struct rcu_head *rcu)
+static void batadv_orig_node_free_rcu(struct rcu_head *rcu)
 {
         struct hlist_node *node, *node_tmp;
         struct neigh_node *neigh_node, *tmp_neigh_node;
@@ -126,21 +124,21 @@ static void orig_node_free_rcu(struct rcu_head *rcu)
         list_for_each_entry_safe(neigh_node, tmp_neigh_node,
                                  &orig_node->bond_list, bonding_list) {
                 list_del_rcu(&neigh_node->bonding_list);
-                neigh_node_free_ref(neigh_node);
+                batadv_neigh_node_free_ref(neigh_node);
         }
 
         /* for all neighbors towards this originator ... */
         hlist_for_each_entry_safe(neigh_node, node, node_tmp,
                                   &orig_node->neigh_list, list) {
                 hlist_del_rcu(&neigh_node->list);
-                neigh_node_free_ref(neigh_node);
+                batadv_neigh_node_free_ref(neigh_node);
         }
 
         spin_unlock_bh(&orig_node->neigh_list_lock);
 
-        frag_list_free(&orig_node->frag_list);
-        tt_global_del_orig(orig_node->bat_priv, orig_node,
-                           "originator timed out");
+        batadv_frag_list_free(&orig_node->frag_list);
+        batadv_tt_global_del_orig(orig_node->bat_priv, orig_node,
+                                  "originator timed out");
 
         kfree(orig_node->tt_buff);
         kfree(orig_node->bcast_own);
@@ -148,13 +146,13 @@ static void orig_node_free_rcu(struct rcu_head *rcu)
         kfree(orig_node);
 }
 
-void orig_node_free_ref(struct orig_node *orig_node)
+void batadv_orig_node_free_ref(struct orig_node *orig_node)
 {
         if (atomic_dec_and_test(&orig_node->refcount))
-                call_rcu(&orig_node->rcu, orig_node_free_rcu);
+                call_rcu(&orig_node->rcu, batadv_orig_node_free_rcu);
 }
 
-void originator_free(struct bat_priv *bat_priv)
+void batadv_originator_free(struct bat_priv *bat_priv)
 {
         struct hashtable_t *hash = bat_priv->orig_hash;
         struct hlist_node *node, *node_tmp;
@@ -179,28 +177,31 @@ void originator_free(struct bat_priv *bat_priv)
                                           head, hash_entry) {
 
                         hlist_del_rcu(node);
-                        orig_node_free_ref(orig_node);
+                        batadv_orig_node_free_ref(orig_node);
                 }
                 spin_unlock_bh(list_lock);
         }
 
-        hash_destroy(hash);
+        batadv_hash_destroy(hash);
 }
 
 /* this function finds or creates an originator entry for the given
- * address if it does not exits */
-struct orig_node *get_orig_node(struct bat_priv *bat_priv, const uint8_t *addr)
+ * address if it does not exits
+ */
+struct orig_node *batadv_get_orig_node(struct bat_priv *bat_priv,
+                                       const uint8_t *addr)
 {
         struct orig_node *orig_node;
         int size;
         int hash_added;
+        unsigned long reset_time;
 
-        orig_node = orig_hash_find(bat_priv, addr);
+        orig_node = batadv_orig_hash_find(bat_priv, addr);
         if (orig_node)
                 return orig_node;
 
-        bat_dbg(DBG_BATMAN, bat_priv,
-                "Creating new originator: %pM\n", addr);
+        batadv_dbg(DBG_BATMAN, bat_priv, "Creating new originator: %pM\n",
+                   addr);
 
         orig_node = kzalloc(sizeof(*orig_node), GFP_ATOMIC);
         if (!orig_node)
@@ -226,14 +227,13 @@ struct orig_node *get_orig_node(struct bat_priv *bat_priv, const uint8_t *addr)
         orig_node->tt_buff = NULL;
         orig_node->tt_buff_len = 0;
         atomic_set(&orig_node->tt_size, 0);
-        orig_node->bcast_seqno_reset = jiffies - 1
-                                        - msecs_to_jiffies(RESET_PROTECTION_MS);
-        orig_node->batman_seqno_reset = jiffies - 1
-                                        - msecs_to_jiffies(RESET_PROTECTION_MS);
+        reset_time = jiffies - 1 - msecs_to_jiffies(BATADV_RESET_PROTECTION_MS);
+        orig_node->bcast_seqno_reset = reset_time;
+        orig_node->batman_seqno_reset = reset_time;
 
         atomic_set(&orig_node->bond_candidates, 0);
 
-        size = bat_priv->num_ifaces * sizeof(unsigned long) * NUM_WORDS;
+        size = bat_priv->num_ifaces * sizeof(unsigned long) * BATADV_NUM_WORDS;
 
         orig_node->bcast_own = kzalloc(size, GFP_ATOMIC);
         if (!orig_node->bcast_own)
@@ -248,8 +248,9 @@ struct orig_node *get_orig_node(struct bat_priv *bat_priv, const uint8_t *addr)
         if (!orig_node->bcast_own_sum)
                 goto free_bcast_own;
 
-        hash_added = hash_add(bat_priv->orig_hash, compare_orig,
-                              choose_orig, orig_node, &orig_node->hash_entry);
+        hash_added = batadv_hash_add(bat_priv->orig_hash, batadv_compare_orig,
+                                     batadv_choose_orig, orig_node,
+                                     &orig_node->hash_entry);
         if (hash_added != 0)
                 goto free_bcast_own_sum;
 
@@ -263,14 +264,15 @@ free_orig_node:
         return NULL;
 }
 
-static bool purge_orig_neighbors(struct bat_priv *bat_priv,
-                                 struct orig_node *orig_node,
-                                 struct neigh_node **best_neigh_node)
+static bool batadv_purge_orig_neighbors(struct bat_priv *bat_priv,
+                                        struct orig_node *orig_node,
+                                        struct neigh_node **best_neigh_node)
 {
         struct hlist_node *node, *node_tmp;
         struct neigh_node *neigh_node;
         bool neigh_purged = false;
         unsigned long last_seen;
+        struct hard_iface *if_incoming;
 
         *best_neigh_node = NULL;
 
@@ -280,34 +282,32 @@ static bool purge_orig_neighbors(struct bat_priv *bat_priv,
         hlist_for_each_entry_safe(neigh_node, node, node_tmp,
                                   &orig_node->neigh_list, list) {
 
-                if ((has_timed_out(neigh_node->last_seen, PURGE_TIMEOUT)) ||
-                    (neigh_node->if_incoming->if_status == IF_INACTIVE) ||
-                    (neigh_node->if_incoming->if_status == IF_NOT_IN_USE) ||
-                    (neigh_node->if_incoming->if_status == IF_TO_BE_REMOVED)) {
-
-                        last_seen = neigh_node->last_seen;
-
-                        if ((neigh_node->if_incoming->if_status ==
-                                                                IF_INACTIVE) ||
-                            (neigh_node->if_incoming->if_status ==
-                                                        IF_NOT_IN_USE) ||
-                            (neigh_node->if_incoming->if_status ==
-                                                        IF_TO_BE_REMOVED))
-                                bat_dbg(DBG_BATMAN, bat_priv,
-                                        "neighbor purge: originator %pM, neighbor: %pM, iface: %s\n",
-                                        orig_node->orig, neigh_node->addr,
-                                        neigh_node->if_incoming->net_dev->name);
+                last_seen = neigh_node->last_seen;
+                if_incoming = neigh_node->if_incoming;
+
+                if ((batadv_has_timed_out(last_seen, BATADV_PURGE_TIMEOUT)) ||
+                    (if_incoming->if_status == IF_INACTIVE) ||
+                    (if_incoming->if_status == IF_NOT_IN_USE) ||
+                    (if_incoming->if_status == IF_TO_BE_REMOVED)) {
+
+                        if ((if_incoming->if_status == IF_INACTIVE) ||
+                            (if_incoming->if_status == IF_NOT_IN_USE) ||
+                            (if_incoming->if_status == IF_TO_BE_REMOVED))
+                                batadv_dbg(DBG_BATMAN, bat_priv,
+                                           "neighbor purge: originator %pM, neighbor: %pM, iface: %s\n",
+                                           orig_node->orig, neigh_node->addr,
+                                           if_incoming->net_dev->name);
                         else
-                                bat_dbg(DBG_BATMAN, bat_priv,
-                                        "neighbor timeout: originator %pM, neighbor: %pM, last_seen: %u\n",
-                                        orig_node->orig, neigh_node->addr,
-                                        jiffies_to_msecs(last_seen));
+                                batadv_dbg(DBG_BATMAN, bat_priv,
+                                           "neighbor timeout: originator %pM, neighbor: %pM, last_seen: %u\n",
+                                           orig_node->orig, neigh_node->addr,
+                                           jiffies_to_msecs(last_seen));
 
                         neigh_purged = true;
 
                         hlist_del_rcu(&neigh_node->list);
-                        bonding_candidate_del(orig_node, neigh_node);
-                        neigh_node_free_ref(neigh_node);
+                        batadv_bonding_candidate_del(orig_node, neigh_node);
+                        batadv_neigh_node_free_ref(neigh_node);
                 } else {
                         if ((!*best_neigh_node) ||
                             (neigh_node->tq_avg > (*best_neigh_node)->tq_avg))
@@ -319,27 +319,29 @@ static bool purge_orig_neighbors(struct bat_priv *bat_priv,
         return neigh_purged;
 }
 
-static bool purge_orig_node(struct bat_priv *bat_priv,
-                            struct orig_node *orig_node)
+static bool batadv_purge_orig_node(struct bat_priv *bat_priv,
+                                   struct orig_node *orig_node)
 {
         struct neigh_node *best_neigh_node;
 
-        if (has_timed_out(orig_node->last_seen, 2 * PURGE_TIMEOUT)) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Originator timeout: originator %pM, last_seen %u\n",
-                        orig_node->orig,
-                        jiffies_to_msecs(orig_node->last_seen));
+        if (batadv_has_timed_out(orig_node->last_seen,
+                                 2 * BATADV_PURGE_TIMEOUT)) {
+                batadv_dbg(DBG_BATMAN, bat_priv,
+                           "Originator timeout: originator %pM, last_seen %u\n",
+                           orig_node->orig,
+                           jiffies_to_msecs(orig_node->last_seen));
                 return true;
         } else {
-                if (purge_orig_neighbors(bat_priv, orig_node,
-                                         &best_neigh_node))
-                        update_route(bat_priv, orig_node, best_neigh_node);
+                if (batadv_purge_orig_neighbors(bat_priv, orig_node,
+                                                &best_neigh_node))
+                        batadv_update_route(bat_priv, orig_node,
+                                            best_neigh_node);
         }
 
         return false;
 }
 
-static void _purge_orig(struct bat_priv *bat_priv)
+static void _batadv_purge_orig(struct bat_priv *bat_priv)
 {
         struct hashtable_t *hash = bat_priv->orig_hash;
         struct hlist_node *node, *node_tmp;
@@ -359,42 +361,43 @@ static void _purge_orig(struct bat_priv *bat_priv)
                 spin_lock_bh(list_lock);
                 hlist_for_each_entry_safe(orig_node, node, node_tmp,
                                           head, hash_entry) {
-                        if (purge_orig_node(bat_priv, orig_node)) {
+                        if (batadv_purge_orig_node(bat_priv, orig_node)) {
                                 if (orig_node->gw_flags)
-                                        gw_node_delete(bat_priv, orig_node);
+                                        batadv_gw_node_delete(bat_priv,
+                                                              orig_node);
                                 hlist_del_rcu(node);
-                                orig_node_free_ref(orig_node);
+                                batadv_orig_node_free_ref(orig_node);
                                 continue;
                         }
 
-                        if (has_timed_out(orig_node->last_frag_packet,
-                                          FRAG_TIMEOUT))
-                                frag_list_free(&orig_node->frag_list);
+                        if (batadv_has_timed_out(orig_node->last_frag_packet,
+                                                 BATADV_FRAG_TIMEOUT))
+                                batadv_frag_list_free(&orig_node->frag_list);
                 }
                 spin_unlock_bh(list_lock);
         }
 
-        gw_node_purge(bat_priv);
-        gw_election(bat_priv);
+        batadv_gw_node_purge(bat_priv);
+        batadv_gw_election(bat_priv);
 }
 
-static void purge_orig(struct work_struct *work)
+static void batadv_purge_orig(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, orig_work);
 
-        _purge_orig(bat_priv);
-        start_purge_timer(bat_priv);
+        _batadv_purge_orig(bat_priv);
+        batadv_start_purge_timer(bat_priv);
 }
 
-void purge_orig_ref(struct bat_priv *bat_priv)
+void batadv_purge_orig_ref(struct bat_priv *bat_priv)
 {
-        _purge_orig(bat_priv);
+        _batadv_purge_orig(bat_priv);
 }
 
-int orig_seq_print_text(struct seq_file *seq, void *offset)
+int batadv_orig_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);
@@ -410,7 +413,7 @@ int orig_seq_print_text(struct seq_file *seq, void *offset)
         uint32_t i;
         int ret = 0;
 
-        primary_if = primary_if_get_selected(bat_priv);
+        primary_if = batadv_primary_if_get_selected(bat_priv);
 
         if (!primary_if) {
                 ret = seq_printf(seq,
@@ -427,18 +430,18 @@ int orig_seq_print_text(struct seq_file *seq, void *offset)
         }
 
         seq_printf(seq, "[B.A.T.M.A.N. adv %s, MainIF/MAC: %s/%pM (%s)]\n",
-                   SOURCE_VERSION, primary_if->net_dev->name,
+                   BATADV_SOURCE_VERSION, primary_if->net_dev->name,
                    primary_if->net_dev->dev_addr, net_dev->name);
         seq_printf(seq, "  %-15s %s (%s/%i) %17s [%10s]: %20s ...\n",
-                   "Originator", "last-seen", "#", TQ_MAX_VALUE, "Nexthop",
-                   "outgoingIF", "Potential nexthops");
+                   "Originator", "last-seen", "#", BATADV_TQ_MAX_VALUE,
+                   "Nexthop", "outgoingIF", "Potential nexthops");
 
         for (i = 0; i < hash->size; i++) {
                 head = &hash->table[i];
 
                 rcu_read_lock();
                 hlist_for_each_entry_rcu(orig_node, node, head, hash_entry) {
-                        neigh_node = orig_node_get_router(orig_node);
+                        neigh_node = batadv_orig_node_get_router(orig_node);
                         if (!neigh_node)
                                 continue;
 
@@ -467,7 +470,7 @@ int orig_seq_print_text(struct seq_file *seq, void *offset)
                         batman_count++;
 
 next:
-                        neigh_node_free_ref(neigh_node);
+                        batadv_neigh_node_free_ref(neigh_node);
                 }
                 rcu_read_unlock();
         }
@@ -477,27 +480,28 @@ next:
 
 out:
         if (primary_if)
-                hardif_free_ref(primary_if);
+                batadv_hardif_free_ref(primary_if);
         return ret;
 }
 
-static int orig_node_add_if(struct orig_node *orig_node, int max_if_num)
+static int batadv_orig_node_add_if(struct orig_node *orig_node, int max_if_num)
 {
         void *data_ptr;
+        size_t data_size, old_size;
 
-        data_ptr = kmalloc(max_if_num * sizeof(unsigned long) * NUM_WORDS,
-                           GFP_ATOMIC);
+        data_size = max_if_num * sizeof(unsigned long) * BATADV_NUM_WORDS;
+        old_size = (max_if_num - 1) * sizeof(unsigned long) * BATADV_NUM_WORDS;
+        data_ptr = kmalloc(data_size, GFP_ATOMIC);
         if (!data_ptr)
-                return -1;
+                return -ENOMEM;
 
-        memcpy(data_ptr, orig_node->bcast_own,
-               (max_if_num - 1) * sizeof(unsigned long) * NUM_WORDS);
+        memcpy(data_ptr, orig_node->bcast_own, old_size);
         kfree(orig_node->bcast_own);
         orig_node->bcast_own = data_ptr;
 
         data_ptr = kmalloc(max_if_num * sizeof(uint8_t), GFP_ATOMIC);
         if (!data_ptr)
-                return -1;
+                return -ENOMEM;
 
         memcpy(data_ptr, orig_node->bcast_own_sum,
                (max_if_num - 1) * sizeof(uint8_t));
@@ -507,7 +511,7 @@ static int orig_node_add_if(struct orig_node *orig_node, int max_if_num)
         return 0;
 }
 
-int orig_hash_add_if(struct hard_iface *hard_iface, int max_if_num)
+int batadv_orig_hash_add_if(struct hard_iface *hard_iface, int max_if_num)
 {
         struct bat_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
         struct hashtable_t *hash = bat_priv->orig_hash;
@@ -518,17 +522,18 @@ int orig_hash_add_if(struct hard_iface *hard_iface, int max_if_num)
         int ret;
 
         /* resize all orig nodes because orig_node->bcast_own(_sum) depend on
-         * if_num */
+         * if_num
+         */
         for (i = 0; i < hash->size; i++) {
                 head = &hash->table[i];
 
                 rcu_read_lock();
                 hlist_for_each_entry_rcu(orig_node, node, head, hash_entry) {
                         spin_lock_bh(&orig_node->ogm_cnt_lock);
-                        ret = orig_node_add_if(orig_node, max_if_num);
+                        ret = batadv_orig_node_add_if(orig_node, max_if_num);
                         spin_unlock_bh(&orig_node->ogm_cnt_lock);
 
-                        if (ret == -1)
+                        if (ret == -ENOMEM)
                                 goto err;
                 }
                 rcu_read_unlock();
@@ -541,8 +546,8 @@ err:
         return -ENOMEM;
 }
 
-static int orig_node_del_if(struct orig_node *orig_node,
-                     int max_if_num, int del_if_num)
+static int batadv_orig_node_del_if(struct orig_node *orig_node,
+                                   int max_if_num, int del_if_num)
 {
         void *data_ptr = NULL;
         int chunk_size;
@@ -551,10 +556,10 @@ static int orig_node_del_if(struct orig_node *orig_node,
         if (max_if_num == 0)
                 goto free_bcast_own;
 
-        chunk_size = sizeof(unsigned long) * NUM_WORDS;
+        chunk_size = sizeof(unsigned long) * BATADV_NUM_WORDS;
         data_ptr = kmalloc(max_if_num * chunk_size, GFP_ATOMIC);
         if (!data_ptr)
-                return -1;
+                return -ENOMEM;
 
         /* copy first part */
         memcpy(data_ptr, orig_node->bcast_own, del_if_num * chunk_size);
@@ -573,7 +578,7 @@ free_bcast_own:
 
         data_ptr = kmalloc(max_if_num * sizeof(uint8_t), GFP_ATOMIC);
         if (!data_ptr)
-                return -1;
+                return -ENOMEM;
 
         memcpy(data_ptr, orig_node->bcast_own_sum,
                del_if_num * sizeof(uint8_t));
@@ -589,7 +594,7 @@ free_own_sum:
         return 0;
 }
 
-int orig_hash_del_if(struct hard_iface *hard_iface, int max_if_num)
+int batadv_orig_hash_del_if(struct hard_iface *hard_iface, int max_if_num)
 {
         struct bat_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
         struct hashtable_t *hash = bat_priv->orig_hash;
@@ -601,18 +606,19 @@ int orig_hash_del_if(struct hard_iface *hard_iface, int max_if_num)
         int ret;
 
         /* resize all orig nodes because orig_node->bcast_own(_sum) depend on
-         * if_num */
+         * if_num
+         */
         for (i = 0; i < hash->size; i++) {
                 head = &hash->table[i];
 
                 rcu_read_lock();
                 hlist_for_each_entry_rcu(orig_node, node, head, hash_entry) {
                         spin_lock_bh(&orig_node->ogm_cnt_lock);
-                        ret = orig_node_del_if(orig_node, max_if_num,
-                                        hard_iface->if_num);
+                        ret = batadv_orig_node_del_if(orig_node, max_if_num,
+                                                      hard_iface->if_num);
                         spin_unlock_bh(&orig_node->ogm_cnt_lock);
 
-                        if (ret == -1)
+                        if (ret == -ENOMEM)
                                 goto err;
                 }
                 rcu_read_unlock();
@@ -620,7 +626,7 @@ int orig_hash_del_if(struct hard_iface *hard_iface, int max_if_num)
 
         /* renumber remaining batman interfaces _inside_ of orig_hash_lock */
         rcu_read_lock();
-        list_for_each_entry_rcu(hard_iface_tmp, &hardif_list, list) {
+        list_for_each_entry_rcu(hard_iface_tmp, &batadv_hardif_list, list) {
                 if (hard_iface_tmp->if_status == IF_NOT_IN_USE)
                         continue;