From: Simon Wunderlich <sw@simonwunderlich.de>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org
Subject: [B.A.T.M.A.N.] [PATCH 17/17] batman-adv: Avoid precedence issues in macros
Date: Thu, 27 Oct 2016 21:01:50 +0200 [thread overview]
Message-ID: <20161027190150.7880-18-sw@simonwunderlich.de> (raw)
In-Reply-To: <20161027190150.7880-1-sw@simonwunderlich.de>
From: Sven Eckelmann <sven@narfation.org>
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>
---
net/batman-adv/log.h | 12 ++++++------
net/batman-adv/main.h | 4 ++--
net/batman-adv/packet.h | 2 +-
3 files changed, 9 insertions(+), 9 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)
diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
index 6a2328d..daddca9 100644
--- a/net/batman-adv/main.h
+++ b/net/batman-adv/main.h
@@ -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;
diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h
index d2e9bbd..7a36bcf 100644
--- a/net/batman-adv/packet.h
+++ b/net/batman-adv/packet.h
@@ -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
--
2.10.1
WARNING: multiple messages have this Message-ID (diff)
From: Simon Wunderlich <sw@simonwunderlich.de>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org,
Sven Eckelmann <sven@narfation.org>,
Simon Wunderlich <sw@simonwunderlich.de>
Subject: [PATCH 17/17] batman-adv: Avoid precedence issues in macros
Date: Thu, 27 Oct 2016 21:01:50 +0200 [thread overview]
Message-ID: <20161027190150.7880-18-sw@simonwunderlich.de> (raw)
In-Reply-To: <20161027190150.7880-1-sw@simonwunderlich.de>
From: Sven Eckelmann <sven@narfation.org>
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>
---
net/batman-adv/log.h | 12 ++++++------
net/batman-adv/main.h | 4 ++--
net/batman-adv/packet.h | 2 +-
3 files changed, 9 insertions(+), 9 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)
diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
index 6a2328d..daddca9 100644
--- a/net/batman-adv/main.h
+++ b/net/batman-adv/main.h
@@ -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;
diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h
index d2e9bbd..7a36bcf 100644
--- a/net/batman-adv/packet.h
+++ b/net/batman-adv/packet.h
@@ -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
--
2.10.1
next prev parent reply other threads:[~2016-10-27 19:01 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-27 19:01 [B.A.T.M.A.N.] [PATCH 00/17] pull request for net-next: batman-adv 2016-10-27 Simon Wunderlich
2016-10-27 19:01 ` Simon Wunderlich
2016-10-27 19:01 ` [B.A.T.M.A.N.] [PATCH 01/17] batman-adv: Start new development cycle Simon Wunderlich
2016-10-27 19:01 ` Simon Wunderlich
2016-10-27 19:01 ` [B.A.T.M.A.N.] [PATCH 02/17] batman-adv: Add B.A.T.M.A.N. V sysfs files to README Simon Wunderlich
2016-10-27 19:01 ` Simon Wunderlich
2016-10-27 19:01 ` [B.A.T.M.A.N.] [PATCH 03/17] batman-adv: Add network_coding and mcast " Simon Wunderlich
2016-10-27 19:01 ` Simon Wunderlich
2016-10-29 10:33 ` [B.A.T.M.A.N.] " Jiri Pirko
2016-10-29 10:33 ` Jiri Pirko
2016-10-29 10:37 ` [B.A.T.M.A.N.] " Sven Eckelmann
2016-10-29 10:37 ` Sven Eckelmann
2016-10-29 10:56 ` [B.A.T.M.A.N.] " Jiri Pirko
2016-10-29 10:56 ` Jiri Pirko
2016-10-29 11:46 ` [B.A.T.M.A.N.] " Sven Eckelmann
2016-10-29 11:46 ` Sven Eckelmann
2016-10-29 13:51 ` [B.A.T.M.A.N.] " Jiri Pirko
2016-10-29 13:51 ` Jiri Pirko
2018-03-27 15:43 ` [B.A.T.M.A.N.] " Linus Lüssing
2018-05-07 6:34 ` Sven Eckelmann
2018-05-07 6:34 ` Sven Eckelmann
2018-05-20 4:37 ` [B.A.T.M.A.N.] " Sven Eckelmann
2018-05-20 4:37 ` Sven Eckelmann
2018-05-20 6:19 ` [B.A.T.M.A.N.] " Jiri Pirko
2018-05-20 6:19 ` Jiri Pirko
2018-08-04 9:24 ` [B.A.T.M.A.N.] " Antonio Quartulli
2018-08-04 9:36 ` Jiri Pirko
2018-08-04 9:36 ` Jiri Pirko
2018-08-04 11:19 ` [B.A.T.M.A.N.] " Antonio Quartulli
2018-08-04 11:52 ` Jiri Pirko
2018-08-04 11:52 ` Jiri Pirko
2016-10-27 19:01 ` [B.A.T.M.A.N.] [PATCH 04/17] batman-adv: Add dat, mcast, nc and neighbor debugfs " Simon Wunderlich
2016-10-27 19:01 ` Simon Wunderlich
2016-10-27 19:01 ` [B.A.T.M.A.N.] [PATCH 05/17] batman-adv: Document new nc, mcast and tpmeter log levels Simon Wunderlich
2016-10-27 19:01 ` Simon Wunderlich
2016-10-27 19:01 ` [B.A.T.M.A.N.] [PATCH 06/17] batman-adv: Remove unused function batadv_hash_delete Simon Wunderlich
2016-10-27 19:01 ` Simon Wunderlich
2016-10-27 19:01 ` [B.A.T.M.A.N.] [PATCH 07/17] batman-adv: Move batadv_sum_counter to soft-interface.c Simon Wunderlich
2016-10-27 19:01 ` Simon Wunderlich
2016-10-27 19:01 ` [B.A.T.M.A.N.] [PATCH 08/17] batman-adv: Remove unused batadv_icmp_user_cmd_type Simon Wunderlich
2016-10-27 19:01 ` Simon Wunderlich
2016-10-27 19:01 ` [B.A.T.M.A.N.] [PATCH 09/17] batman-adv: fix batadv_forw_packet kerneldoc for list attribute Simon Wunderlich
2016-10-27 19:01 ` Simon Wunderlich
2016-10-27 19:01 ` [B.A.T.M.A.N.] [PATCH 10/17] batman-adv: remove unsed argument from batadv_dbg_arp() function Simon Wunderlich
2016-10-27 19:01 ` Simon Wunderlich
2016-10-27 19:01 ` [B.A.T.M.A.N.] [PATCH 11/17] batman-adv: Allow selecting BATMAN V if CFG80211 is not built Simon Wunderlich
2016-10-27 19:01 ` Simon Wunderlich
2016-10-27 19:01 ` [B.A.T.M.A.N.] [PATCH 12/17] batman-adv: Less function calls in batadv_is_ap_isolated() after error detection Simon Wunderlich
2016-10-27 19:01 ` Simon Wunderlich
2016-10-27 19:01 ` [B.A.T.M.A.N.] [PATCH 13/17] batman-adv: Remove needless init of variables on stack Simon Wunderlich
2016-10-27 19:01 ` Simon Wunderlich
2016-10-27 19:01 ` [B.A.T.M.A.N.] [PATCH 14/17] batman-adv: Use proper name for fragments list head Simon Wunderlich
2016-10-27 19:01 ` Simon Wunderlich
2016-10-27 19:01 ` [B.A.T.M.A.N.] [PATCH 15/17] batman-adv: Use proper name for gateway " Simon Wunderlich
2016-10-27 19:01 ` Simon Wunderlich
2016-10-27 19:01 ` [B.A.T.M.A.N.] [PATCH 16/17] batman-adv: Use octal permissions instead of macros Simon Wunderlich
2016-10-27 19:01 ` Simon Wunderlich
2016-10-27 19:01 ` Simon Wunderlich [this message]
2016-10-27 19:01 ` [PATCH 17/17] batman-adv: Avoid precedence issues in macros Simon Wunderlich
2016-10-28 21:13 ` [B.A.T.M.A.N.] " Joe Perches
2016-10-28 21:13 ` Joe Perches
2016-10-28 21:27 ` [B.A.T.M.A.N.] " Sven Eckelmann
2016-10-28 21:27 ` Sven Eckelmann
2016-10-29 1:56 ` [B.A.T.M.A.N.] " Joe Perches
2016-10-29 1:56 ` Joe Perches
2016-10-29 6:52 ` [B.A.T.M.A.N.] " Sven Eckelmann
2016-10-29 6:52 ` Sven Eckelmann
2016-10-29 20:28 ` [B.A.T.M.A.N.] [PATCH 00/17] pull request for net-next: batman-adv 2016-10-27 David Miller
2016-10-29 20:28 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161027190150.7880-18-sw@simonwunderlich.de \
--to=sw@simonwunderlich.de \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.