diff options
author | Joe Perches <joe@perches.com> | 2010-08-24 09:21:08 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-08-26 17:11:48 -0400 |
commit | 145ce502e44b57c074c72cfdc855557e19026999 (patch) | |
tree | fd663feae03f5c5f4a31ceecd6a61e790344b8b3 /net/sctp/ipv6.c | |
parent | dee06e4702b5a64b9ca81e650d66223c5b3e7f14 (diff) |
net/sctp: Use pr_fmt and pr_<level>
Change SCTP_DEBUG_PRINTK and SCTP_DEBUG_PRINTK_IPADDR to
use do { print } while (0) guards.
Add SCTP_DEBUG_PRINTK_CONT to fix errors in log when
lines were continued.
Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
Add a missing newline in "Failed bind hash alloc"
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/ipv6.c')
-rw-r--r-- | net/sctp/ipv6.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c index 732689140fb8..95e0c8eda1a0 100644 --- a/net/sctp/ipv6.c +++ b/net/sctp/ipv6.c | |||
@@ -47,6 +47,8 @@ | |||
47 | * be incorporated into the next SCTP release. | 47 | * be incorporated into the next SCTP release. |
48 | */ | 48 | */ |
49 | 49 | ||
50 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
51 | |||
50 | #include <linux/module.h> | 52 | #include <linux/module.h> |
51 | #include <linux/errno.h> | 53 | #include <linux/errno.h> |
52 | #include <linux/types.h> | 54 | #include <linux/types.h> |
@@ -336,7 +338,7 @@ static void sctp_v6_get_saddr(struct sctp_sock *sk, | |||
336 | memcpy(saddr, baddr, sizeof(union sctp_addr)); | 338 | memcpy(saddr, baddr, sizeof(union sctp_addr)); |
337 | SCTP_DEBUG_PRINTK("saddr: %pI6\n", &saddr->v6.sin6_addr); | 339 | SCTP_DEBUG_PRINTK("saddr: %pI6\n", &saddr->v6.sin6_addr); |
338 | } else { | 340 | } else { |
339 | printk(KERN_ERR "%s: asoc:%p Could not find a valid source " | 341 | pr_err("%s: asoc:%p Could not find a valid source " |
340 | "address for the dest:%pI6\n", | 342 | "address for the dest:%pI6\n", |
341 | __func__, asoc, &daddr->v6.sin6_addr); | 343 | __func__, asoc, &daddr->v6.sin6_addr); |
342 | } | 344 | } |