Commit 4c7da0f6 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Simon Wunderlich
Browse files

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: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarSimon Wunderlich <sw@simonwunderlich.de>
parent 507b37cf

net/batman-adv/log.h

+6 −6
Original line number Diff line number Diff line
@@ -73,8 +73,8 @@ __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()))		\

		if (atomic_read(&(bat_priv)->log_level) & (type) &&	\

		    (!(ratelimited) || net_ratelimit()))		\

			batadv_debug_log(bat_priv, fmt, ## arg);	\

	}								\

	while (0)

net/batman-adv/main.h

+2 −2
Original line number Diff line number Diff line
@@ -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;

net/batman-adv/packet.h

+1 −1
Original line number Diff line number Diff line
@@ -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