summaryrefslogtreecommitdiff
path: root/net/dccp/proto.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-10-12 11:43:42 -0700
committerDavid S. Miller <davem@davemloft.net>2010-10-12 11:43:42 -0700
commit8fa6e3d4549271a5b4094893f059bb95f99a8fde (patch)
tree4c8ae1be73e4749f782cc3f18ec6e42650b8f872 /net/dccp/proto.c
parentc239f279e571a272c1b32a1e84b8fa037b68f49c (diff)
parent2f34b32977ade4249601f35f7eb0cdd56b4e0f89 (diff)
downloadlinux-8fa6e3d4549271a5b4094893f059bb95f99a8fde.tar.gz
linux-8fa6e3d4549271a5b4094893f059bb95f99a8fde.tar.xz
Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
Diffstat (limited to 'net/dccp/proto.c')
-rw-r--r--net/dccp/proto.c2
1 files changed, 1 insertions, 1 deletions
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)
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) {