batman-adv: Prefix originator non-static functions with batadv_

batman-adv can be compiled as part of the kernel instead of an module. In that
case the linker will see all non-static symbols of batman-adv and all other
non-static symbols of the kernel. This could lead to symbol collisions. A
prefix for the batman-adv symbols that defines their private namespace avoids
such a problem.

Reported-by: David Miller <davem@davemloft.net>
Signed-off-by: Sven Eckelmann <sven@narfation.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index 4f44f049186f..1f126cbd2c79 100644
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -312,7 +312,7 @@ int batadv_hardif_enable_interface(struct hard_iface *hard_iface,
         hard_iface->if_num = bat_priv->num_ifaces;
         bat_priv->num_ifaces++;
         hard_iface->if_status = IF_INACTIVE;
-        orig_hash_add_if(hard_iface, bat_priv->num_ifaces);
+        batadv_orig_hash_add_if(hard_iface, bat_priv->num_ifaces);
 
         hard_iface->batman_adv_ptype.type = __constant_htons(ETH_P_BATMAN);
         hard_iface->batman_adv_ptype.func = batman_skb_recv;
@@ -373,7 +373,7 @@ void batadv_hardif_disable_interface(struct hard_iface *hard_iface)
         dev_remove_pack(&hard_iface->batman_adv_ptype);
 
         bat_priv->num_ifaces--;
-        orig_hash_del_if(hard_iface, bat_priv->num_ifaces);
+        batadv_orig_hash_del_if(hard_iface, bat_priv->num_ifaces);
 
         primary_if = primary_if_get_selected(bat_priv);
         if (hard_iface == primary_if) {
@@ -390,7 +390,7 @@ void batadv_hardif_disable_interface(struct hard_iface *hard_iface)
         hard_iface->if_status = IF_NOT_IN_USE;
 
         /* delete all references to this hard_iface */
-        purge_orig_ref(bat_priv);
+        batadv_purge_orig_ref(bat_priv);
         purge_outstanding_packets(bat_priv, hard_iface);
         dev_put(hard_iface->soft_iface);