batman-adv: Prefix main static inline functions with batadv_

All non-static symbols of batman-adv were prefixed with batadv_ to avoid
collisions with other symbols of the kernel. Other symbols of batman-adv
should use the same prefix to keep the naming scheme consistent.

Signed-off-by: Sven Eckelmann <sven@narfation.org>

1 files changed, 15 insertions, 12 deletions

diff --git a/net/batman-adv/vis.c b/net/batman-adv/vis.c
index bf72c524866..d45989e0bbd 100644
--- a/net/batman-adv/vis.c
+++ b/net/batman-adv/vis.c
@@ -59,7 +59,7 @@ static int vis_info_cmp(const struct hlist_node *node, const void *data2)
         d2 = data2;
         p1 = (struct vis_packet *)d1->skb_packet->data;
         p2 = (struct vis_packet *)d2->skb_packet->data;
-        return compare_eth(p1->vis_orig, p2->vis_orig);
+        return batadv_compare_eth(p1->vis_orig, p2->vis_orig);
 }
 
 /* hash function to choose an entry in a hash table of given size
@@ -127,7 +127,7 @@ static void vis_data_insert_interface(const uint8_t *interface,
         struct hlist_node *pos;
 
         hlist_for_each_entry(entry, pos, if_list, list) {
-                if (compare_eth(entry->addr, interface))
+                if (batadv_compare_eth(entry->addr, interface))
                         return;
         }
 
@@ -181,7 +181,7 @@ static ssize_t vis_data_read_entry(char *buff,
         /* maximal length: max(4+17+2, 3+17+1+3+2) == 26 */
         if (primary && entry->quality == 0)
                 return sprintf(buff, "TT %pM, ", entry->dest);
-        else if (compare_eth(entry->src, src))
+        else if (batadv_compare_eth(entry->src, src))
                 return sprintf(buff, "TQ %pM %d, ", entry->dest,
                                entry->quality);
 
@@ -233,8 +233,8 @@ int batadv_vis_seq_print_text(struct seq_file *seq, void *offset)
                         for (j = 0; j < packet->entries; j++) {
                                 if (entries[j].quality == 0)
                                         continue;
-                                if (compare_eth(entries[j].src,
-                                                packet->vis_orig))
+                                if (batadv_compare_eth(entries[j].src,
+                                                       packet->vis_orig))
                                         continue;
                                 vis_data_insert_interface(entries[j].src,
                                                           &vis_if_list,
@@ -245,7 +245,8 @@ int batadv_vis_seq_print_text(struct seq_file *seq, void *offset)
                                 buf_size += 18 + 26 * packet->entries;
 
                                 /* add primary/secondary records */
-                                if (compare_eth(entry->addr, packet->vis_orig))
+                                if (batadv_compare_eth(entry->addr,
+                                                       packet->vis_orig))
                                         buf_size +=
                                           vis_data_count_prim_sec(&vis_if_list);
 
@@ -285,8 +286,8 @@ int batadv_vis_seq_print_text(struct seq_file *seq, void *offset)
                         for (j = 0; j < packet->entries; j++) {
                                 if (entries[j].quality == 0)
                                         continue;
-                                if (compare_eth(entries[j].src,
-                                                packet->vis_orig))
+                                if (batadv_compare_eth(entries[j].src,
+                                                       packet->vis_orig))
                                         continue;
                                 vis_data_insert_interface(entries[j].src,
                                                           &vis_if_list,
@@ -305,7 +306,8 @@ int batadv_vis_seq_print_text(struct seq_file *seq, void *offset)
                                                         entry->primary);
 
                                 /* add primary/secondary records */
-                                if (compare_eth(entry->addr, packet->vis_orig))
+                                if (batadv_compare_eth(entry->addr,
+                                                       packet->vis_orig))
                                         buff_pos +=
                                          vis_data_read_prim_sec(buff + buff_pos,
                                                                 &vis_if_list);
@@ -379,7 +381,7 @@ static int recv_list_is_in(struct bat_priv *bat_priv,
 
         spin_lock_bh(&bat_priv->vis_list_lock);
         list_for_each_entry(entry, recv_list, list) {
-                if (compare_eth(entry->mac, mac)) {
+                if (batadv_compare_eth(entry->mac, mac)) {
                         spin_unlock_bh(&bat_priv->vis_list_lock);
                         return 1;
                 }
@@ -651,7 +653,7 @@ static int generate_vis_packet(struct bat_priv *bat_priv)
                         if (!router)
                                 continue;
 
-                        if (!compare_eth(router->addr, orig_node->orig))
+                        if (!batadv_compare_eth(router->addr, orig_node->orig))
                                 goto next;
 
                         if (router->if_incoming->if_status != IF_ACTIVE)
@@ -728,7 +730,8 @@ static void purge_vis_packets(struct bat_priv *bat_priv)
                         if (info == bat_priv->my_vis_info)
                                 continue;
 
-                        if (has_timed_out(info->first_seen, VIS_TIMEOUT)) {
+                        if (batadv_has_timed_out(info->first_seen,
+                                                 VIS_TIMEOUT)) {
                                 hlist_del(node);
                                 send_list_del(info);
                                 kref_put(&info->refcount, free_info);