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/sm_statefuns.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/sm_statefuns.c')
-rw-r--r-- | net/sctp/sm_statefuns.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c index 24b2cd555637..8b284436be65 100644 --- a/net/sctp/sm_statefuns.c +++ b/net/sctp/sm_statefuns.c | |||
@@ -50,6 +50,8 @@ | |||
50 | * be incorporated into the next SCTP release. | 50 | * be incorporated into the next SCTP release. |
51 | */ | 51 | */ |
52 | 52 | ||
53 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
54 | |||
53 | #include <linux/types.h> | 55 | #include <linux/types.h> |
54 | #include <linux/kernel.h> | 56 | #include <linux/kernel.h> |
55 | #include <linux/ip.h> | 57 | #include <linux/ip.h> |
@@ -1138,18 +1140,16 @@ sctp_disposition_t sctp_sf_backbeat_8_3(const struct sctp_endpoint *ep, | |||
1138 | if (unlikely(!link)) { | 1140 | if (unlikely(!link)) { |
1139 | if (from_addr.sa.sa_family == AF_INET6) { | 1141 | if (from_addr.sa.sa_family == AF_INET6) { |
1140 | if (net_ratelimit()) | 1142 | if (net_ratelimit()) |
1141 | printk(KERN_WARNING | 1143 | pr_warn("%s association %p could not find address %pI6\n", |
1142 | "%s association %p could not find address %pI6\n", | 1144 | __func__, |
1143 | __func__, | 1145 | asoc, |
1144 | asoc, | 1146 | &from_addr.v6.sin6_addr); |
1145 | &from_addr.v6.sin6_addr); | ||
1146 | } else { | 1147 | } else { |
1147 | if (net_ratelimit()) | 1148 | if (net_ratelimit()) |
1148 | printk(KERN_WARNING | 1149 | pr_warn("%s association %p could not find address %pI4\n", |
1149 | "%s association %p could not find address %pI4\n", | 1150 | __func__, |
1150 | __func__, | 1151 | asoc, |
1151 | asoc, | 1152 | &from_addr.v4.sin_addr.s_addr); |
1152 | &from_addr.v4.sin_addr.s_addr); | ||
1153 | } | 1153 | } |
1154 | return SCTP_DISPOSITION_DISCARD; | 1154 | return SCTP_DISPOSITION_DISCARD; |
1155 | } | 1155 | } |