batman-adv: Prefix routing 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, 2 deletions

diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
index e92055da5074..2bf330d16485 100644
--- a/net/batman-adv/gateway_client.c
+++ b/net/batman-adv/gateway_client.c
@@ -682,7 +682,8 @@ bool batadv_gw_out_of_range(struct bat_priv *bat_priv,
                 /* If the dhcp packet has been sent to a different gw,
                  * we have to evaluate whether the old gw is still
                  * reliable enough */
-                neigh_curr = find_router(bat_priv, curr_gw->orig_node, NULL);
+                neigh_curr = batadv_find_router(bat_priv, curr_gw->orig_node,
+                                                NULL);
                 if (!neigh_curr)
                         goto out;
 
@@ -693,7 +694,7 @@ bool batadv_gw_out_of_range(struct bat_priv *bat_priv,
                 goto out;
         }
 
-        neigh_old = find_router(bat_priv, orig_dst_node, NULL);
+        neigh_old = batadv_find_router(bat_priv, orig_dst_node, NULL);
         if (!neigh_old)
                 goto out;