diff options
author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2011-04-26 06:23:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-06-02 05:04:53 -0400 |
commit | 3ced2dddf10f26f0aaff96f3345a3d876cea62f8 (patch) | |
tree | 13e3d169f7095d0338aedc94c37c63525e396e1c /include/net | |
parent | b1364104e37c9d8cf437746ba5f5dfedcc0bc132 (diff) |
sctp: Allow regular C expression in 4th argument for SCTP_DEBUG_PRINTK_IPADDR macro.
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>
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/sctp/sctp.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index b2c2366676a7..0037e28e80e5 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h | |||
@@ -285,20 +285,21 @@ do { \ | |||
285 | pr_cont(fmt, ##args); \ | 285 | pr_cont(fmt, ##args); \ |
286 | } while (0) | 286 | } while (0) |
287 | #define SCTP_DEBUG_PRINTK_IPADDR(fmt_lead, fmt_trail, \ | 287 | #define SCTP_DEBUG_PRINTK_IPADDR(fmt_lead, fmt_trail, \ |
288 | args_lead, saddr, args_trail...) \ | 288 | args_lead, addr, args_trail...) \ |
289 | do { \ | 289 | do { \ |
290 | const union sctp_addr *_addr = (addr); \ | ||
290 | if (sctp_debug_flag) { \ | 291 | if (sctp_debug_flag) { \ |
291 | if (saddr->sa.sa_family == AF_INET6) { \ | 292 | if (_addr->sa.sa_family == AF_INET6) { \ |
292 | printk(KERN_DEBUG \ | 293 | printk(KERN_DEBUG \ |
293 | pr_fmt(fmt_lead "%pI6" fmt_trail), \ | 294 | pr_fmt(fmt_lead "%pI6" fmt_trail), \ |
294 | args_lead, \ | 295 | args_lead, \ |
295 | &saddr->v6.sin6_addr, \ | 296 | &_addr->v6.sin6_addr, \ |
296 | args_trail); \ | 297 | args_trail); \ |
297 | } else { \ | 298 | } else { \ |
298 | printk(KERN_DEBUG \ | 299 | printk(KERN_DEBUG \ |
299 | pr_fmt(fmt_lead "%pI4" fmt_trail), \ | 300 | pr_fmt(fmt_lead "%pI4" fmt_trail), \ |
300 | args_lead, \ | 301 | args_lead, \ |
301 | &saddr->v4.sin_addr.s_addr, \ | 302 | &_addr->v4.sin_addr.s_addr, \ |
302 | args_trail); \ | 303 | args_trail); \ |
303 | } \ | 304 | } \ |
304 | } \ | 305 | } \ |