batman-adv: Prefix unicast 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>

diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index 0888f1e39fdcc5a16242f59a52240839b36810b7..3eb4a2e121a62c2f836fd708434b0522c057b8e6 100644 (file)
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -869,7 +869,8 @@ static int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if)
        }
 
        if (unicast_packet->header.packet_type == BAT_UNICAST_FRAG &&
-           frag_can_reassemble(skb, neigh_node->if_incoming->net_dev->mtu)) {
+           batadv_frag_can_reassemble(skb,
+                                      neigh_node->if_incoming->net_dev->mtu)) {
 
                ret = batadv_frag_reassemble_skb(skb, bat_priv, &new_skb);
 

diff --git a/net/batman-adv/unicast.h b/net/batman-adv/unicast.h
index 87f8f89d14404715d540a6a303c6458c7f3008d9..9257b83534fdc8d96ebf8ce21c400aac5778d798 100644 (file)
--- a/net/batman-adv/unicast.h
+++ b/net/batman-adv/unicast.h
@@ -33,7 +33,7 @@ int batadv_frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
                         struct hard_iface *hard_iface,
                         const uint8_t dstaddr[]);
 
-static inline int frag_can_reassemble(const struct sk_buff *skb, int mtu)
+static inline int batadv_frag_can_reassemble(const struct sk_buff *skb, int mtu)
 {
        const struct unicast_frag_packet *unicast_packet;
        int uneven_correction = 0;