sctp: Allow regular C expression in 4th argument for SCTP_DEBUG_PRINTK_IPADDR macro.
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Tue, 26 Apr 2011 10:23:24 +0000 (19:23 +0900)
committerDavid S. Miller <davem@davemloft.net>
Thu, 2 Jun 2011 09:04:53 +0000 (02:04 -0700)
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Acked-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/sctp/sctp.h

index b2c2366676a706335ed3a7b4e486d6cff3d69bc5..0037e28e80e56bcb4e0c4691ded20463ec3fa4e9 100644 (file)
@@ -285,20 +285,21 @@ do {                                                      \
                pr_cont(fmt, ##args);                   \
 } while (0)
 #define SCTP_DEBUG_PRINTK_IPADDR(fmt_lead, fmt_trail,                  \
-                                args_lead, saddr, args_trail...)       \
+                                args_lead, addr, args_trail...)        \
 do {                                                                   \
+       const union sctp_addr *_addr = (addr);                          \
        if (sctp_debug_flag) {                                          \
-               if (saddr->sa.sa_family == AF_INET6) {                  \
+               if (_addr->sa.sa_family == AF_INET6) {                  \
                        printk(KERN_DEBUG                               \
                               pr_fmt(fmt_lead "%pI6" fmt_trail),       \
                               args_lead,                               \
-                              &saddr->v6.sin6_addr,                    \
+                              &_addr->v6.sin6_addr,                    \
                               args_trail);                             \
                } else {                                                \
                        printk(KERN_DEBUG                               \
                               pr_fmt(fmt_lead "%pI4" fmt_trail),       \
                               args_lead,                               \
-                              &saddr->v4.sin_addr.s_addr,              \
+                              &_addr->v4.sin_addr.s_addr,              \
                               args_trail);                             \
                }                                                       \
        }                                                               \