dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
YOSHIFUJI Hideaki 2011-04-26 19:23:24 +09:00 committed by David S. Miller
parent b1364104e3
commit 3ced2dddf1
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/net/sctp/sctp.h
View File

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