diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-12 14:43:42 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-12 14:43:42 -0400 |
| commit | 8fa6e3d4549271a5b4094893f059bb95f99a8fde (patch) | |
| tree | 4c8ae1be73e4749f782cc3f18ec6e42650b8f872 /net/dccp/proto.c | |
| parent | c239f279e571a272c1b32a1e84b8fa037b68f49c (diff) | |
| parent | 2f34b32977ade4249601f35f7eb0cdd56b4e0f89 (diff) | |
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.c | 2 |
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) | |||
| 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) { |