diff options
author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2010-10-11 14:44:42 -0400 |
---|---|---|
committer | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2010-10-12 00:57:43 -0400 |
commit | 2f34b32977ade4249601f35f7eb0cdd56b4e0f89 (patch) | |
tree | cacdef9003d861cc0b3d5feaf3080ea5cad11ed7 | |
parent | ecdfbdabbe4e0cf0443cbbea2df1bf51bf67f3f3 (diff) |
dccp: cosmetics - warning format
This omits the redundant "DCCP:" in warning messages, since DCCP_WARN() already
echoes the function name, avoiding messages like
kernel: [10988.766503] dccp_close: DCCP: ABORT -- 209 bytes unread
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
-rw-r--r-- | net/dccp/input.c | 2 | ||||
-rw-r--r-- | net/dccp/proto.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/dccp/input.c b/net/dccp/input.c index aecc8c7443c2..265985370fa1 100644 --- a/net/dccp/input.c +++ b/net/dccp/input.c | |||
@@ -259,7 +259,7 @@ static int dccp_check_seqno(struct sock *sk, struct sk_buff *skb) | |||
259 | sysctl_dccp_sync_ratelimit))) | 259 | sysctl_dccp_sync_ratelimit))) |
260 | return 0; | 260 | return 0; |
261 | 261 | ||
262 | DCCP_WARN("DCCP: Step 6 failed for %s packet, " | 262 | DCCP_WARN("Step 6 failed for %s packet, " |
263 | "(LSWL(%llu) <= P.seqno(%llu) <= S.SWH(%llu)) and " | 263 | "(LSWL(%llu) <= P.seqno(%llu) <= S.SWH(%llu)) and " |
264 | "(P.ackno %s or LAWL(%llu) <= P.ackno(%llu) <= S.AWH(%llu), " | 264 | "(P.ackno %s or LAWL(%llu) <= P.ackno(%llu) <= S.AWH(%llu), " |
265 | "sending SYNC...\n", dccp_packet_name(dh->dccph_type), | 265 | "sending SYNC...\n", dccp_packet_name(dh->dccph_type), |
diff --git a/net/dccp/proto.c b/net/dccp/proto.c index b054ba1f55d2..7e5fc04eb6d1 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c | |||
@@ -944,7 +944,7 @@ void dccp_close(struct sock *sk, long timeout) | |||
944 | 944 | ||
945 | if (data_was_unread) { | 945 | if (data_was_unread) { |
946 | /* Unread data was tossed, send an appropriate Reset Code */ | 946 | /* Unread data was tossed, send an appropriate Reset Code */ |
947 | DCCP_WARN("DCCP: ABORT -- %u bytes unread\n", data_was_unread); | 947 | DCCP_WARN("ABORT with %u bytes unread\n", data_was_unread); |
948 | dccp_send_reset(sk, DCCP_RESET_CODE_ABORTED); | 948 | dccp_send_reset(sk, DCCP_RESET_CODE_ABORTED); |
949 | dccp_set_state(sk, DCCP_CLOSED); | 949 | dccp_set_state(sk, DCCP_CLOSED); |
950 | } else if (sock_flag(sk, SOCK_LINGER) && !sk->sk_lingertime) { | 950 | } else if (sock_flag(sk, SOCK_LINGER) && !sk->sk_lingertime) { |