Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[mirror_ubuntu-zesty-kernel.git] / net / batman-adv / log.h

diff --git a/net/batman-adv/log.h b/net/batman-adv/log.h
index d2905a855d1b9b3e55b102ec7c4b33a389395476..3284a7b0325dc631bc8de438a0f62ba8587c9f50 100644 (file)
--- a/net/batman-adv/log.h
+++ b/net/batman-adv/log.h
@@ -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)