aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/proto.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-21 12:22:33 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-21 12:22:33 -0700
commitcffc7b38a23960d5f83b0aec5e67f189a6ae8062 (patch)
tree2d3d5f6bd4447a482d4fcf51a788e2fc4c34c20d /net/dccp/proto.c
parente29971f9a4ca08c3c31b98be96c293ef9f7dcc32 (diff)
parentb2cc99f04c5a732c793519aca61a20f719b50db4 (diff)
downloadlinux-cffc7b38a23960d5f83b0aec5e67f189a6ae8062.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
Diffstat (limited to 'net/dccp/proto.c')
-rw-r--r--net/dccp/proto.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index a1cfd0e9e3bc9..a021c3422f677 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -402,8 +402,6 @@ int dccp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
* This bug was _quickly_ found & fixed by just looking at an OSTRA
* generated callgraph 8) -acme
*/
- if (rc != 0)
- goto out_discard;
out_release:
release_sock(sk);
return rc ? : len;