diff options
| author | David S. Miller <davem@davemloft.net> | 2016-10-29 16:26:50 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-10-29 16:26:50 -0400 |
| commit | a283ad5066cd63f595224c7476001cfc367fdf2e (patch) | |
| tree | 8c61419bf534c101cf2bc206a348cc2993472ee2 /net/batman-adv/log.h | |
| parent | 6ce40fc5413cf01056416c24fc340c0409981221 (diff) | |
| parent | 4c7da0f6dbcde2431d773ce03cde5e7abede54e0 (diff) | |
| download | op-kernel-dev-a283ad5066cd63f595224c7476001cfc367fdf2e.zip op-kernel-dev-a283ad5066cd63f595224c7476001cfc367fdf2e.tar.gz | |
Merge tag 'batadv-next-for-davem-20161027' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
This code cleanup patchset includes the following changes (chronological
order):
- bump version strings, by Simon Wunderlich
- README updates/clean up, by Sven Eckelmann (4 patches)
- Code clean up and restructuring by Sven Eckelmann (2 patches)
- Kerneldoc fix in forw_packet structure, by Linus Luessing
- Remove unused argument in dbg_arp, by Antonio Quartulli
- Add support to build batman-adv without wireless, by Linus Luessing
- Restructure error handling for is_ap_isolated, by Markus Elfring
- Remove unused initialization in various functions, by Sven Eckelmann
- Use better names for fragment and gateway list heads, by Sven
Eckelmann (2 patches)
- Convert to octal permissions for files, by Sven Eckelmann
- Avoid precedence issues for some macros, by Sven Eckelmann
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/log.h')
| -rw-r--r-- | net/batman-adv/log.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/batman-adv/log.h b/net/batman-adv/log.h index e0e1a88..ab47acf 100644 --- 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) |
