batman-adv: Allow to use BATMAN_ADV_DEBUG without BATMAN_ADV_DEBUGFS

The BATMAN_ADV_DEBUGFS portion of batman-adv is marked as deprecated. Thus
all required functionality should be available without it. The debug log
was already modified to also output via the kernel tracing function but
still retained its BATMAN_ADV_DEBUGFS functionality.

Separate the entry point for the debug log from the debugfs portions to
make it possible to build with BATMAN_ADV_DEBUG and without
BATMAN_ADV_DEBUGFS.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>

diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig
index f75816f58107efe004140c2965d46ce742b9515e..7b0e1fcddfa7ed60989f8e33e2fcdd10f44ce1d9 100644 (file)
--- a/net/batman-adv/Kconfig
+++ b/net/batman-adv/Kconfig
@@ -100,7 +100,7 @@ config BATMAN_ADV_DEBUGFS
 
 config BATMAN_ADV_DEBUG
        bool "B.A.T.M.A.N. debugging"
-       depends on BATMAN_ADV_DEBUGFS
+       depends on BATMAN_ADV
        help
          This is an option for use by developers; most people should
          say N here. This enables compilation of support for

diff --git a/net/batman-adv/log.c b/net/batman-adv/log.c
index 6beb5f0678106636ba39cb804bb3e2cee18349c7..02e55b78132f018f01200a228d080403f54fa444 100644 (file)
--- a/net/batman-adv/log.c
+++ b/net/batman-adv/log.c
@@ -43,6 +43,8 @@
 #include "debugfs.h"
 #include "trace.h"
 
+#ifdef CONFIG_BATMAN_ADV_DEBUGFS
+
 #define BATADV_LOG_BUFF_MASK (batadv_log_buff_len - 1)
 
 static const int batadv_log_buff_len = BATADV_LOG_BUF_LEN;
@@ -92,33 +94,6 @@ static int batadv_fdebug_log(struct batadv_priv_debug_log *debug_log,
        return 0;
 }
 
-/**
- * batadv_debug_log() - Add debug log entry
- * @bat_priv: the bat priv with all the soft interface information
- * @fmt: format string
- *
- * Return: 0 on success or negative error number in case of failure
- */
-int batadv_debug_log(struct batadv_priv *bat_priv, const char *fmt, ...)
-{
-       struct va_format vaf;
-       va_list args;
-
-       va_start(args, fmt);
-
-       vaf.fmt = fmt;
-       vaf.va = &args;
-
-       batadv_fdebug_log(bat_priv->debug_log, "[%10u] %pV",
-                         jiffies_to_msecs(jiffies), &vaf);
-
-       trace_batadv_dbg(bat_priv, &vaf);
-
-       va_end(args);
-
-       return 0;
-}
-
 static int batadv_log_open(struct inode *inode, struct file *file)
 {
        if (!try_module_get(THIS_MODULE))
@@ -259,3 +234,34 @@ void batadv_debug_log_cleanup(struct batadv_priv *bat_priv)
        kfree(bat_priv->debug_log);
        bat_priv->debug_log = NULL;
 }
+
+#endif /* CONFIG_BATMAN_ADV_DEBUGFS */
+
+/**
+ * batadv_debug_log() - Add debug log entry
+ * @bat_priv: the bat priv with all the soft interface information
+ * @fmt: format string
+ *
+ * Return: 0 on success or negative error number in case of failure
+ */
+int batadv_debug_log(struct batadv_priv *bat_priv, const char *fmt, ...)
+{
+       struct va_format vaf;
+       va_list args;
+
+       va_start(args, fmt);
+
+       vaf.fmt = fmt;
+       vaf.va = &args;
+
+#ifdef CONFIG_BATMAN_ADV_DEBUGFS
+       batadv_fdebug_log(bat_priv->debug_log, "[%10u] %pV",
+                         jiffies_to_msecs(jiffies), &vaf);
+#endif
+
+       trace_batadv_dbg(bat_priv, &vaf);
+
+       va_end(args);
+
+       return 0;
+}