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>

diff --git a/net/dccp/input.c b/net/dccp/input.c
index aecc8c7443c28db2daed8251d6e766f1ec89e219..265985370fa1de664b1b7f3de427cb043fc74665 100644 (file)
--- 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)
                                      sysctl_dccp_sync_ratelimit)))
                        return 0;
 
-               DCCP_WARN("DCCP: Step 6 failed for %s packet, "
+               DCCP_WARN("Step 6 failed for %s packet, "
                          "(LSWL(%llu) <= P.seqno(%llu) <= S.SWH(%llu)) and "
                          "(P.ackno %s or LAWL(%llu) <= P.ackno(%llu) <= S.AWH(%llu), "
                          "sending SYNC...\n",  dccp_packet_name(dh->dccph_type),

diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index b054ba1f55d2bec7241e47821b923495f391cd5e..7e5fc04eb6d1989986b7c7241f0e5cb2106ce4d8 100644 (file)
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -944,7 +944,7 @@ void dccp_close(struct sock *sk, long timeout)
 
        if (data_was_unread) {
                /* Unread data was tossed, send an appropriate Reset Code */
-               DCCP_WARN("DCCP: ABORT -- %u bytes unread\n", data_was_unread);
+               DCCP_WARN("ABORT with %u bytes unread\n", data_was_unread);
                dccp_send_reset(sk, DCCP_RESET_CODE_ABORTED);
                dccp_set_state(sk, DCCP_CLOSED);
        } else if (sock_flag(sk, SOCK_LINGER) && !sk->sk_lingertime) {