The following commit has been merged in the master branch: commit 32702996b5a81e70eceb19f69360aa0a9346bc9f Author: Sven Eckelmann sven@narfation.org Date: Sun Jun 3 22:19:08 2012 +0200

batman-adv: Prefix debugfs defines with BATADV_

Reported-by: Martin Hundebøll martin@hundeboll.net Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/bat_debugfs.c b/bat_debugfs.c index 095e6e8..c28b9de 100644 --- a/bat_debugfs.c +++ b/bat_debugfs.c @@ -311,7 +311,7 @@ void batadv_debugfs_init(void) struct bat_debuginfo *bat_debug; struct dentry *file;

- batadv_debugfs = debugfs_create_dir(DEBUGFS_BAT_SUBDIR, NULL); + batadv_debugfs = debugfs_create_dir(BATADV_DEBUGFS_SUBDIR, NULL); if (batadv_debugfs == ERR_PTR(-ENODEV)) batadv_debugfs = NULL;

diff --git a/bat_debugfs.h b/bat_debugfs.h index eb0d576..3319e1f 100644 --- a/bat_debugfs.h +++ b/bat_debugfs.h @@ -20,7 +20,7 @@ #ifndef _NET_BATMAN_ADV_DEBUGFS_H_ #define _NET_BATMAN_ADV_DEBUGFS_H_

-#define DEBUGFS_BAT_SUBDIR "batman_adv" +#define BATADV_DEBUGFS_SUBDIR "batman_adv"

void batadv_debugfs_init(void); void batadv_debugfs_destroy(void);