Merge tag 'v4.10-rc1' into docs-next

[karo-tx-linux.git] / net / batman-adv / log.h

diff --git a/net/batman-adv/log.h b/net/batman-adv/log.h
index e0e1a88c3e5807dfefea4dc0f255b69087c1f15b..3284a7b0325dc631bc8de438a0f62ba8587c9f50 100644 (file)
--- a/net/batman-adv/log.h
+++ b/net/batman-adv/log.h
@@ -63,7 +63,7 @@ enum batadv_dbg_level {
        BATADV_DBG_NC           = BIT(5),
        BATADV_DBG_MCAST        = BIT(6),
        BATADV_DBG_TP_METER     = BIT(7),
-       BATADV_DBG_ALL          = 127,
+       BATADV_DBG_ALL          = 255,
 };
 
 #ifdef CONFIG_BATMAN_ADV_DEBUG
@@ -71,12 +71,12 @@ int batadv_debug_log(struct batadv_priv *bat_priv, const char *fmt, ...)
 __printf(2, 3);
 
 /* possibly ratelimited debug output */
-#define _batadv_dbg(type, bat_priv, ratelimited, fmt, arg...)  \
-       do {                                                    \
-               if (atomic_read(&bat_priv->log_level) & type && \
-                   (!ratelimited || net_ratelimit()))          \
-                       batadv_debug_log(bat_priv, fmt, ## arg);\
-       }                                                       \
+#define _batadv_dbg(type, bat_priv, ratelimited, fmt, arg...)          \
+       do {                                                            \
+               if (atomic_read(&(bat_priv)->log_level) & (type) &&     \
+                   (!(ratelimited) || net_ratelimit()))                \
+                       batadv_debug_log(bat_priv, fmt, ## arg);        \
+       }                                                               \
        while (0)
 #else /* !CONFIG_BATMAN_ADV_DEBUG */
 __printf(4, 5)