batman-adv: Prefix sysfs defines with BATADV_

Reported-by: Martin Hundebøll <martin@hundeboll.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 3862fe18a0330806eb2594f16c023c5ba12c3401..725e7d74f5670a1512e0e176a82bcb9169e959f1 100644 (file)
--- a/net/batman-adv/bat_sysfs.c
+++ b/net/batman-adv/bat_sysfs.c
@@ -505,11 +505,11 @@ int batadv_sysfs_add_meshif(struct net_device *dev)
        struct bat_attribute **bat_attr;
        int err;
 
-       bat_priv->mesh_obj = kobject_create_and_add(SYSFS_IF_MESH_SUBDIR,
+       bat_priv->mesh_obj = kobject_create_and_add(BATADV_SYSFS_IF_MESH_SUBDIR,
                                                    batif_kobject);
        if (!bat_priv->mesh_obj) {
                batadv_err(dev, "Can't add sysfs directory: %s/%s\n", dev->name,
-                          SYSFS_IF_MESH_SUBDIR);
+                          BATADV_SYSFS_IF_MESH_SUBDIR);
                goto out;
        }
 
@@ -518,7 +518,7 @@ int batadv_sysfs_add_meshif(struct net_device *dev)
                                        &((*bat_attr)->attr));
                if (err) {
                        batadv_err(dev, "Can't add sysfs file: %s/%s/%s\n",
-                                  dev->name, SYSFS_IF_MESH_SUBDIR,
+                                  dev->name, BATADV_SYSFS_IF_MESH_SUBDIR,
                                   ((*bat_attr)->attr).name);
                        goto rem_attr;
                }
@@ -673,12 +673,12 @@ int batadv_sysfs_add_hardif(struct kobject **hardif_obj, struct net_device *dev)
        struct bat_attribute **bat_attr;
        int err;
 
-       *hardif_obj = kobject_create_and_add(SYSFS_IF_BAT_SUBDIR,
-                                                   hardif_kobject);
+       *hardif_obj = kobject_create_and_add(BATADV_SYSFS_IF_BAT_SUBDIR,
+                                            hardif_kobject);
 
        if (!*hardif_obj) {
                batadv_err(dev, "Can't add sysfs directory: %s/%s\n", dev->name,
-                          SYSFS_IF_BAT_SUBDIR);
+                          BATADV_SYSFS_IF_BAT_SUBDIR);
                goto out;
        }
 
@@ -686,7 +686,7 @@ int batadv_sysfs_add_hardif(struct kobject **hardif_obj, struct net_device *dev)
                err = sysfs_create_file(*hardif_obj, &((*bat_attr)->attr));
                if (err) {
                        batadv_err(dev, "Can't add sysfs file: %s/%s/%s\n",
-                                  dev->name, SYSFS_IF_BAT_SUBDIR,
+                                  dev->name, BATADV_SYSFS_IF_BAT_SUBDIR,
                                   ((*bat_attr)->attr).name);
                        goto rem_attr;
                }

diff --git a/net/batman-adv/bat_sysfs.h b/net/batman-adv/bat_sysfs.h
index 367227707d52a463e14008e80df16b2864f530d9..23a8390851a618a29e92046fd75cbf3d354317b0 100644 (file)
--- a/net/batman-adv/bat_sysfs.h
+++ b/net/batman-adv/bat_sysfs.h
@@ -20,8 +20,8 @@
 #ifndef _NET_BATMAN_ADV_SYSFS_H_
 #define _NET_BATMAN_ADV_SYSFS_H_
 
-#define SYSFS_IF_MESH_SUBDIR "mesh"
-#define SYSFS_IF_BAT_SUBDIR "batman_adv"
+#define BATADV_SYSFS_IF_MESH_SUBDIR "mesh"
+#define BATADV_SYSFS_IF_BAT_SUBDIR "batman_adv"
 
 struct bat_attribute {
        struct attribute attr;