batman-adv: Prefix types structs with batadv_

Reported-by: Martin Hundebøll <martin@hundeboll.net>
Signed-off-by: Sven Eckelmann <sven@narfation.org>

1 files changed, 54 insertions, 48 deletions

diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
index dc9c4bf63118..fc1ce26ac627 100644
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@ -30,7 +30,7 @@
 
 static void batadv_purge_orig(struct work_struct *work);
 
-static void batadv_start_purge_timer(struct bat_priv *bat_priv)
+static void batadv_start_purge_timer(struct batadv_priv *bat_priv)
 {
         INIT_DELAYED_WORK(&bat_priv->orig_work, batadv_purge_orig);
         queue_delayed_work(batadv_event_workqueue,
@@ -40,12 +40,13 @@ static void batadv_start_purge_timer(struct bat_priv *bat_priv)
 /* returns 1 if they are the same originator */
 static int batadv_compare_orig(const struct hlist_node *node, const void *data2)
 {
-        const void *data1 = container_of(node, struct orig_node, hash_entry);
+        const void *data1 = container_of(node, struct batadv_orig_node,
+                                         hash_entry);
 
         return (memcmp(data1, data2, ETH_ALEN) == 0 ? 1 : 0);
 }
 
-int batadv_originator_init(struct bat_priv *bat_priv)
+int batadv_originator_init(struct batadv_priv *bat_priv)
 {
         if (bat_priv->orig_hash)
                 return 0;
@@ -62,16 +63,17 @@ err:
         return -ENOMEM;
 }
 
-void batadv_neigh_node_free_ref(struct neigh_node *neigh_node)
+void batadv_neigh_node_free_ref(struct batadv_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 *batadv_orig_node_get_router(struct orig_node *orig_node)
+struct batadv_neigh_node *
+batadv_orig_node_get_router(struct batadv_orig_node *orig_node)
 {
-        struct neigh_node *router;
+        struct batadv_neigh_node *router;
 
         rcu_read_lock();
         router = rcu_dereference(orig_node->router);
@@ -83,12 +85,12 @@ struct neigh_node *batadv_orig_node_get_router(struct orig_node *orig_node)
         return router;
 }
 
-struct neigh_node *batadv_neigh_node_new(struct hard_iface *hard_iface,
-                                         const uint8_t *neigh_addr,
-                                         uint32_t seqno)
+struct batadv_neigh_node *
+batadv_neigh_node_new(struct batadv_hard_iface *hard_iface,
+                      const uint8_t *neigh_addr, uint32_t seqno)
 {
-        struct bat_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
-        struct neigh_node *neigh_node;
+        struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
+        struct batadv_neigh_node *neigh_node;
 
         neigh_node = kzalloc(sizeof(*neigh_node), GFP_ATOMIC);
         if (!neigh_node)
@@ -113,10 +115,10 @@ out:
 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;
-        struct orig_node *orig_node;
+        struct batadv_neigh_node *neigh_node, *tmp_neigh_node;
+        struct batadv_orig_node *orig_node;
 
-        orig_node = container_of(rcu, struct orig_node, rcu);
+        orig_node = container_of(rcu, struct batadv_orig_node, rcu);
 
         spin_lock_bh(&orig_node->neigh_list_lock);
 
@@ -146,19 +148,19 @@ static void batadv_orig_node_free_rcu(struct rcu_head *rcu)
         kfree(orig_node);
 }
 
-void batadv_orig_node_free_ref(struct orig_node *orig_node)
+void batadv_orig_node_free_ref(struct batadv_orig_node *orig_node)
 {
         if (atomic_dec_and_test(&orig_node->refcount))
                 call_rcu(&orig_node->rcu, batadv_orig_node_free_rcu);
 }
 
-void batadv_originator_free(struct bat_priv *bat_priv)
+void batadv_originator_free(struct batadv_priv *bat_priv)
 {
         struct batadv_hashtable *hash = bat_priv->orig_hash;
         struct hlist_node *node, *node_tmp;
         struct hlist_head *head;
         spinlock_t *list_lock; /* spinlock to protect write access */
-        struct orig_node *orig_node;
+        struct batadv_orig_node *orig_node;
         uint32_t i;
 
         if (!hash)
@@ -188,10 +190,10 @@ void batadv_originator_free(struct bat_priv *bat_priv)
 /* this function finds or creates an originator entry for the given
  * address if it does not exits
  */
-struct orig_node *batadv_get_orig_node(struct bat_priv *bat_priv,
-                                       const uint8_t *addr)
+struct batadv_orig_node *batadv_get_orig_node(struct batadv_priv *bat_priv,
+                                              const uint8_t *addr)
 {
-        struct orig_node *orig_node;
+        struct batadv_orig_node *orig_node;
         int size;
         int hash_added;
         unsigned long reset_time;
@@ -264,15 +266,16 @@ free_orig_node:
         return NULL;
 }
 
-static bool batadv_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 batadv_priv *bat_priv,
+                            struct batadv_orig_node *orig_node,
+                            struct batadv_neigh_node **best_neigh_node)
 {
         struct hlist_node *node, *node_tmp;
-        struct neigh_node *neigh_node;
+        struct batadv_neigh_node *neigh_node;
         bool neigh_purged = false;
         unsigned long last_seen;
-        struct hard_iface *if_incoming;
+        struct batadv_hard_iface *if_incoming;
 
         *best_neigh_node = NULL;
 
@@ -319,10 +322,10 @@ static bool batadv_purge_orig_neighbors(struct bat_priv *bat_priv,
         return neigh_purged;
 }
 
-static bool batadv_purge_orig_node(struct bat_priv *bat_priv,
-                                   struct orig_node *orig_node)
+static bool batadv_purge_orig_node(struct batadv_priv *bat_priv,
+                                   struct batadv_orig_node *orig_node)
 {
-        struct neigh_node *best_neigh_node;
+        struct batadv_neigh_node *best_neigh_node;
 
         if (batadv_has_timed_out(orig_node->last_seen,
                                  2 * BATADV_PURGE_TIMEOUT)) {
@@ -341,13 +344,13 @@ static bool batadv_purge_orig_node(struct bat_priv *bat_priv,
         return false;
 }
 
-static void _batadv_purge_orig(struct bat_priv *bat_priv)
+static void _batadv_purge_orig(struct batadv_priv *bat_priv)
 {
         struct batadv_hashtable *hash = bat_priv->orig_hash;
         struct hlist_node *node, *node_tmp;
         struct hlist_head *head;
         spinlock_t *list_lock; /* spinlock to protect write access */
-        struct orig_node *orig_node;
+        struct batadv_orig_node *orig_node;
         uint32_t i;
 
         if (!hash)
@@ -383,16 +386,16 @@ static void _batadv_purge_orig(struct bat_priv *bat_priv)
 
 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);
+        struct delayed_work *delayed_work;
+        struct batadv_priv *bat_priv;
 
+        delayed_work = container_of(work, struct delayed_work, work);
+        bat_priv = container_of(delayed_work, struct batadv_priv, orig_work);
         _batadv_purge_orig(bat_priv);
         batadv_start_purge_timer(bat_priv);
 }
 
-void batadv_purge_orig_ref(struct bat_priv *bat_priv)
+void batadv_purge_orig_ref(struct batadv_priv *bat_priv)
 {
         _batadv_purge_orig(bat_priv);
 }
@@ -400,13 +403,13 @@ void batadv_purge_orig_ref(struct bat_priv *bat_priv)
 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);
+        struct batadv_priv *bat_priv = netdev_priv(net_dev);
         struct batadv_hashtable *hash = bat_priv->orig_hash;
         struct hlist_node *node, *node_tmp;
         struct hlist_head *head;
-        struct hard_iface *primary_if;
-        struct orig_node *orig_node;
-        struct neigh_node *neigh_node, *neigh_node_tmp;
+        struct batadv_hard_iface *primary_if;
+        struct batadv_orig_node *orig_node;
+        struct batadv_neigh_node *neigh_node, *neigh_node_tmp;
         int batman_count = 0;
         int last_seen_secs;
         int last_seen_msecs;
@@ -484,7 +487,8 @@ out:
         return ret;
 }
 
-static int batadv_orig_node_add_if(struct orig_node *orig_node, int max_if_num)
+static int batadv_orig_node_add_if(struct batadv_orig_node *orig_node,
+                                   int max_if_num)
 {
         void *data_ptr;
         size_t data_size, old_size;
@@ -511,13 +515,14 @@ static int batadv_orig_node_add_if(struct orig_node *orig_node, int max_if_num)
         return 0;
 }
 
-int batadv_orig_hash_add_if(struct hard_iface *hard_iface, int max_if_num)
+int batadv_orig_hash_add_if(struct batadv_hard_iface *hard_iface,
+                            int max_if_num)
 {
-        struct bat_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
+        struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
         struct batadv_hashtable *hash = bat_priv->orig_hash;
         struct hlist_node *node;
         struct hlist_head *head;
-        struct orig_node *orig_node;
+        struct batadv_orig_node *orig_node;
         uint32_t i;
         int ret;
 
@@ -546,7 +551,7 @@ err:
         return -ENOMEM;
 }
 
-static int batadv_orig_node_del_if(struct orig_node *orig_node,
+static int batadv_orig_node_del_if(struct batadv_orig_node *orig_node,
                                    int max_if_num, int del_if_num)
 {
         void *data_ptr = NULL;
@@ -594,14 +599,15 @@ free_own_sum:
         return 0;
 }
 
-int batadv_orig_hash_del_if(struct hard_iface *hard_iface, int max_if_num)
+int batadv_orig_hash_del_if(struct batadv_hard_iface *hard_iface,
+                            int max_if_num)
 {
-        struct bat_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
+        struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
         struct batadv_hashtable *hash = bat_priv->orig_hash;
         struct hlist_node *node;
         struct hlist_head *head;
-        struct hard_iface *hard_iface_tmp;
-        struct orig_node *orig_node;
+        struct batadv_hard_iface *hard_iface_tmp;
+        struct batadv_orig_node *orig_node;
         uint32_t i;
         int ret;