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

diff --git a/net/batman-adv/bat_sysfs.c b/net/batman-adv/bat_sysfs.c
index dc1edbee63df777e04b099c1bd246daa8d6d13ee..5dce1abc35d427bea1b50c4a3870be66b98eaeff 100644 (file)
--- a/net/batman-adv/bat_sysfs.c
+++ b/net/batman-adv/bat_sysfs.c
@@ -469,7 +469,7 @@ static struct bat_attribute *mesh_attrs[] = {
        NULL,
 };
 
-int sysfs_add_meshif(struct net_device *dev)
+int batadv_sysfs_add_meshif(struct net_device *dev)
 {
        struct kobject *batif_kobject = &dev->dev.kobj;
        struct bat_priv *bat_priv = netdev_priv(dev);
@@ -507,7 +507,7 @@ out:
        return -ENOMEM;
 }
 
-void sysfs_del_meshif(struct net_device *dev)
+void batadv_sysfs_del_meshif(struct net_device *dev)
 {
        struct bat_priv *bat_priv = netdev_priv(dev);
        struct bat_attribute **bat_attr;
@@ -637,7 +637,7 @@ static struct bat_attribute *batman_attrs[] = {
        NULL,
 };
 
-int sysfs_add_hardif(struct kobject **hardif_obj, struct net_device *dev)
+int batadv_sysfs_add_hardif(struct kobject **hardif_obj, struct net_device *dev)
 {
        struct kobject *hardif_kobject = &dev->dev.kobj;
        struct bat_attribute **bat_attr;
@@ -671,14 +671,14 @@ out:
        return -ENOMEM;
 }
 
-void sysfs_del_hardif(struct kobject **hardif_obj)
+void batadv_sysfs_del_hardif(struct kobject **hardif_obj)
 {
        kobject_put(*hardif_obj);
        *hardif_obj = NULL;
 }
 
-int throw_uevent(struct bat_priv *bat_priv, enum uev_type type,
-                enum uev_action action, const char *data)
+int batadv_throw_uevent(struct bat_priv *bat_priv, enum uev_type type,
+                       enum uev_action action, const char *data)
 {
        int ret = -ENOMEM;
        struct hard_iface *primary_if = NULL;

diff --git a/net/batman-adv/bat_sysfs.h b/net/batman-adv/bat_sysfs.h
index fece77ae586e39a0b7d4d4f9d2c4ad334ddbf255..f01aea836b9835e9ae64943b70e6c0c492343715 100644 (file)
--- a/net/batman-adv/bat_sysfs.h
+++ b/net/batman-adv/bat_sysfs.h
@@ -34,11 +34,12 @@ struct bat_attribute {
                         char *buf, size_t count);
 };
 
-int sysfs_add_meshif(struct net_device *dev);
-void sysfs_del_meshif(struct net_device *dev);
-int sysfs_add_hardif(struct kobject **hardif_obj, struct net_device *dev);
-void sysfs_del_hardif(struct kobject **hardif_obj);
-int throw_uevent(struct bat_priv *bat_priv, enum uev_type type,
-                enum uev_action action, const char *data);
+int batadv_sysfs_add_meshif(struct net_device *dev);
+void batadv_sysfs_del_meshif(struct net_device *dev);
+int batadv_sysfs_add_hardif(struct kobject **hardif_obj,
+                           struct net_device *dev);
+void batadv_sysfs_del_hardif(struct kobject **hardif_obj);
+int batadv_throw_uevent(struct bat_priv *bat_priv, enum uev_type type,
+                       enum uev_action action, const char *data);
 
 #endif /* _NET_BATMAN_ADV_SYSFS_H_ */

diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
index 47f7186dcefcdce2e090e80660ed8bb6dba369c2..1d7f08e026f3b9bf622100365687deebcfceef9a 100644 (file)
--- a/net/batman-adv/gateway_client.c
+++ b/net/batman-adv/gateway_client.c
@@ -220,19 +220,19 @@ void gw_election(struct bat_priv *bat_priv)
        if ((curr_gw) && (!next_gw)) {
                bat_dbg(DBG_BATMAN, bat_priv,
                        "Removing selected gateway - no gateway in range\n");
-               throw_uevent(bat_priv, UEV_GW, UEV_DEL, NULL);
+               batadv_throw_uevent(bat_priv, UEV_GW, UEV_DEL, NULL);
        } else if ((!curr_gw) && (next_gw)) {
                bat_dbg(DBG_BATMAN, bat_priv,
                        "Adding route to gateway %pM (gw_flags: %i, tq: %i)\n",
                        next_gw->orig_node->orig, next_gw->orig_node->gw_flags,
                        router->tq_avg);
-               throw_uevent(bat_priv, UEV_GW, UEV_ADD, gw_addr);
+               batadv_throw_uevent(bat_priv, UEV_GW, UEV_ADD, gw_addr);
        } else {
                bat_dbg(DBG_BATMAN, bat_priv,
                        "Changing route to gateway %pM (gw_flags: %i, tq: %i)\n",
                        next_gw->orig_node->orig, next_gw->orig_node->gw_flags,
                        router->tq_avg);
-               throw_uevent(bat_priv, UEV_GW, UEV_CHANGE, gw_addr);
+               batadv_throw_uevent(bat_priv, UEV_GW, UEV_CHANGE, gw_addr);
        }
 
        gw_select(bat_priv, next_gw);

diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index ce78c6d645c60c1f742e1a94326994244c163a4d..380572e721e633547dbfb7c1d62ad478e7097a65 100644 (file)
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -423,7 +423,7 @@ static struct hard_iface *hardif_add_interface(struct net_device *net_dev)
        if (!hard_iface)
                goto release_dev;
 
-       ret = sysfs_add_hardif(&hard_iface->hardif_obj, net_dev);
+       ret = batadv_sysfs_add_hardif(&hard_iface->hardif_obj, net_dev);
        if (ret)
                goto free_if;
 
@@ -467,7 +467,7 @@ static void hardif_remove_interface(struct hard_iface *hard_iface)
                return;
 
        hard_iface->if_status = IF_TO_BE_REMOVED;
-       sysfs_del_hardif(&hard_iface->hardif_obj);
+       batadv_sysfs_del_hardif(&hard_iface->hardif_obj);
        hardif_free_ref(hard_iface);
 }
 

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 0f0003b00f8c347fcc5e6b1e9734b9f00f664add..11bfe533e2a44d339b2eab0706c905af74c74216 100644 (file)
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -415,7 +415,7 @@ 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;
 
@@ -432,7 +432,7 @@ struct net_device *softif_create(const char *name)
 unreg_debugfs:
        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:
@@ -448,7 +448,7 @@ out:
 void softif_destroy(struct net_device *soft_iface)
 {
        batadv_debugfs_del_meshif(soft_iface);
-       sysfs_del_meshif(soft_iface);
+       batadv_sysfs_del_meshif(soft_iface);
        mesh_free(soft_iface);
        unregister_netdevice(soft_iface);
 }