diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-25 06:33:44 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-25 06:33:44 +0000 |
commit | 6bd6dbbd3ae53a268a510270bebaab24fff382ca (patch) | |
tree | 41d0361e6b48ce74584c9a6fcb475d5054ca4141 /net/socket.c | |
parent | ee355114ec6062d00c1376b184b886a39e74fd4e (diff) |
Merge with Linux 2.4.0-test6-pre10.
Diffstat (limited to 'net/socket.c')
-rw-r--r-- | net/socket.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index 2993991dd..f0565ed3e 100644 --- a/net/socket.c +++ b/net/socket.c @@ -1372,7 +1372,6 @@ asmlinkage long sys_sendmsg(int fd, struct msghdr *msg, unsigned flags) { if (ctl_len > sizeof(ctl)) { - err = -ENOBUFS; ctl_buf = sock_kmalloc(sock->sk, ctl_len, GFP_KERNEL); if (ctl_buf == NULL) goto out_freeiov; |