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

[deliverable/linux.git] / net / batman-adv / soft-interface.c

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 304a7ba09e03c3c6be067658764ab04be48450c8..16e866ad17597df8cd8016ed93560bf96e46fd8f 100644 (file)
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -162,7 +162,7 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface)
                goto dropped;
        }
 
-       if (bla_tx(bat_priv, skb, vid))
+       if (batadv_bla_tx(bat_priv, skb, vid))
                goto dropped;
 
        /* Register the client MAC in the transtable */
@@ -309,7 +309,7 @@ void interface_rx(struct net_device *soft_iface,
        /* Let the bridge loop avoidance check the packet. If will
         * not handle it, we can safely push it up.
         */
-       if (bla_rx(bat_priv, skb, vid))
+       if (batadv_bla_rx(bat_priv, skb, vid))
                goto out;
 
        netif_rx(skb);
@@ -415,11 +415,11 @@ struct net_device *softif_create(const char *name)
        if (ret < 0)
                goto free_bat_counters;
 
-       ret = sysfs_add_meshif(soft_iface);
+       ret = batadv_sysfs_add_meshif(soft_iface);
        if (ret < 0)
                goto free_bat_counters;
 
-       ret = debugfs_add_meshif(soft_iface);
+       ret = batadv_debugfs_add_meshif(soft_iface);
        if (ret < 0)
                goto unreg_sysfs;
 
@@ -430,9 +430,9 @@ struct net_device *softif_create(const char *name)
        return soft_iface;
 
 unreg_debugfs:
-       debugfs_del_meshif(soft_iface);
+       batadv_debugfs_del_meshif(soft_iface);
 unreg_sysfs:
-       sysfs_del_meshif(soft_iface);
+       batadv_sysfs_del_meshif(soft_iface);
 free_bat_counters:
        free_percpu(bat_priv->bat_counters);
 unreg_soft_iface:
@@ -447,8 +447,8 @@ out:
 
 void softif_destroy(struct net_device *soft_iface)
 {
-       debugfs_del_meshif(soft_iface);
-       sysfs_del_meshif(soft_iface);
+       batadv_debugfs_del_meshif(soft_iface);
+       batadv_sysfs_del_meshif(soft_iface);
        mesh_free(soft_iface);
        unregister_netdevice(soft_iface);
 }