diff options
| author | Ingo Molnar | 2013-12-16 14:51:32 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2013-12-16 14:51:32 +0100 |
| commit | fe361cfcf40ad4612226347573a8669cd0d44799 (patch) | |
| tree | e874ef5a29c3bfe3dd67dc2d8962562c00fc8e3a /net/rds/recv.c | |
| parent | perf: Optimize ring-buffer write by depending on control dependencies (diff) | |
| parent | Linux 3.13-rc4 (diff) | |
| download | kernel-qcow2-linux-fe361cfcf40ad4612226347573a8669cd0d44799.tar.gz kernel-qcow2-linux-fe361cfcf40ad4612226347573a8669cd0d44799.tar.xz kernel-qcow2-linux-fe361cfcf40ad4612226347573a8669cd0d44799.zip | |
Merge tag 'v3.13-rc4' into perf/core
Merge Linux 3.13-rc4, to refresh this branch with the latest fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/rds/recv.c')
| -rw-r--r-- | net/rds/recv.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/rds/recv.c b/net/rds/recv.c index 9f0f17cf6bf9..de339b24ca14 100644 --- a/net/rds/recv.c +++ b/net/rds/recv.c @@ -410,8 +410,6 @@ int rds_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, rdsdebug("size %zu flags 0x%x timeo %ld\n", size, msg_flags, timeo); - msg->msg_namelen = 0; - if (msg_flags & MSG_OOB) goto out; |