mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 22:21:40 +00:00
batman-adv: Avoid precedence issues in macros
It must be avoided that arguments to a macro are evaluated ungrouped (which enforces normal operator precendence). Otherwise the result of the macro is not well defined. Signed-off-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
This commit is contained in:
parent
507b37cf71
commit
4c7da0f6db
@ -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)
|
||||
|
@ -199,8 +199,8 @@ struct packet_type;
|
||||
struct seq_file;
|
||||
struct sk_buff;
|
||||
|
||||
#define BATADV_PRINT_VID(vid) ((vid & BATADV_VLAN_HAS_TAG) ? \
|
||||
(int)(vid & VLAN_VID_MASK) : -1)
|
||||
#define BATADV_PRINT_VID(vid) (((vid) & BATADV_VLAN_HAS_TAG) ? \
|
||||
(int)((vid) & VLAN_VID_MASK) : -1)
|
||||
|
||||
extern struct list_head batadv_hardif_list;
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
#include <asm/byteorder.h>
|
||||
#include <linux/types.h>
|
||||
|
||||
#define batadv_tp_is_error(n) ((u8)n > 127 ? 1 : 0)
|
||||
#define batadv_tp_is_error(n) ((u8)(n) > 127 ? 1 : 0)
|
||||
|
||||
/**
|
||||
* enum batadv_packettype - types for batman-adv encapsulated packets
|
||||
|
Loading…
Reference in New Issue
Block a user