summaryrefslogtreecommitdiffstats
path: root/net/batman-adv/debugfs.c
diff options
context:
space:
mode:
authorMarkus Pargmann <mpa@pengutronix.de>2014-12-26 12:41:18 +0100
committerAntonio Quartulli <antonio@meshcoding.com>2015-05-29 10:13:35 +0200
commit9bb218828c8f4fa6587af93e248903c96ce469d0 (patch)
treef7032b450be40f839eea8fe160290e5c5ab6d21e /net/batman-adv/debugfs.c
parentbatman-adv: Use only queued fragments when merging (diff)
downloadlinux-9bb218828c8f4fa6587af93e248903c96ce469d0.tar.xz
linux-9bb218828c8f4fa6587af93e248903c96ce469d0.zip
batman-adv: debugfs, avoid compiling for !DEBUG_FS
Normally the debugfs framework will return error pointer with -ENODEV for function calls when DEBUG_FS is not set. batman does not notice this error code and continues trying to create debugfs files and executes more code. We can avoid this code execution by disabling compiling debugfs.c when DEBUG_FS is not set. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Diffstat (limited to 'net/batman-adv/debugfs.c')
-rw-r--r--net/batman-adv/debugfs.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c
index 0c213a892296..46118084221a 100644
--- a/net/batman-adv/debugfs.c
+++ b/net/batman-adv/debugfs.c
@@ -482,11 +482,7 @@ rem_attr:
debugfs_remove_recursive(hard_iface->debug_dir);
hard_iface->debug_dir = NULL;
out:
-#ifdef CONFIG_DEBUG_FS
return -ENOMEM;
-#else
- return 0;
-#endif /* CONFIG_DEBUG_FS */
}
/**
@@ -541,11 +537,7 @@ rem_attr:
debugfs_remove_recursive(bat_priv->debug_dir);
bat_priv->debug_dir = NULL;
out:
-#ifdef CONFIG_DEBUG_FS
return -ENOMEM;
-#else
- return 0;
-#endif /* CONFIG_DEBUG_FS */
}
void batadv_debugfs_del_meshif(struct net_device *dev)