diff --git a/[refs] b/[refs] index 8cdbf73ae1a8..cbbf71d7ee90 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ecdfbdabbe4e0cf0443cbbea2df1bf51bf67f3f3 +refs/heads/master: 2f34b32977ade4249601f35f7eb0cdd56b4e0f89 diff --git a/trunk/net/dccp/input.c b/trunk/net/dccp/input.c index aecc8c7443c2..265985370fa1 100644 --- a/trunk/net/dccp/input.c +++ b/trunk/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/trunk/net/dccp/proto.c b/trunk/net/dccp/proto.c index b054ba1f55d2..7e5fc04eb6d1 100644 --- a/trunk/net/dccp/proto.c +++ b/trunk/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) {