batman-adv: Prefix soft-interface 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/unicast.c b/net/batman-adv/unicast.c
index 6bb3bb9f843f..52179c8ae9bd 100644
--- a/net/batman-adv/unicast.c
+++ b/net/batman-adv/unicast.c
@@ -242,8 +242,8 @@ int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
         memcpy(&tmp_uc, unicast_packet, uc_hdr_len);
         skb_split(skb, frag_skb, data_len / 2 + uc_hdr_len);
 
-        if (my_skb_head_push(skb, ucf_hdr_len - uc_hdr_len) < 0 ||
-            my_skb_head_push(frag_skb, ucf_hdr_len) < 0)
+        if (batadv_skb_head_push(skb, ucf_hdr_len - uc_hdr_len) < 0 ||
+            batadv_skb_head_push(frag_skb, ucf_hdr_len) < 0)
                 goto drop_frag;
 
         frag1 = (struct unicast_frag_packet *)skb->data;
@@ -314,7 +314,7 @@ find_router:
         if (!neigh_node)
                 goto out;
 
-        if (my_skb_head_push(skb, sizeof(*unicast_packet)) < 0)
+        if (batadv_skb_head_push(skb, sizeof(*unicast_packet)) < 0)
                 goto out;
 
         unicast_packet = (struct unicast_packet *)skb->data;