1 files changed, 48 insertions, 0 deletions
diff --git a/queue-2.6.39/net-recvmmsg-strip-msg_waitforone-when-calling-recvmsg.patch b/queue-2.6.39/net-recvmmsg-strip-msg_waitforone-when-calling-recvmsg.patch
new file mode 100644
index 0000000000..28ca1e8ba9
--- /dev/null
+++ b/queue-2.6.39/net-recvmmsg-strip-msg_waitforone-when-calling-recvmsg.patch
@@ -0,0 +1,48 @@
+From b9eb8b8752804cecbacdb4d24b52e823cf07f107 Mon Sep 17 00:00:00 2001
+From: Anton Blanchard <anton@samba.org>
+Date: Tue, 17 May 2011 15:38:57 -0400
+Subject: net: recvmmsg: Strip MSG_WAITFORONE when calling recvmsg
+
+From: Anton Blanchard <anton@samba.org>
+
+commit b9eb8b8752804cecbacdb4d24b52e823cf07f107 upstream.
+
+recvmmsg fails on a raw socket with EINVAL. The reason for this is
+packet_recvmsg checks the incoming flags:
+
+        err = -EINVAL;
+        if (flags & ~(MSG_PEEK|MSG_DONTWAIT|MSG_TRUNC|MSG_CMSG_COMPAT|MSG_ERRQUEUE))
+                goto out;
+
+This patch strips out MSG_WAITFORONE when calling recvmmsg which
+fixes the issue.
+
+Signed-off-by: Anton Blanchard <anton@samba.org>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ net/socket.c |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/net/socket.c
++++ b/net/socket.c
+@@ -2122,14 +2122,16 @@ int __sys_recvmmsg(int fd, struct mmsghd
+ 		 */
+ 		if (MSG_CMSG_COMPAT & flags) {
+ 			err = __sys_recvmsg(sock, (struct msghdr __user *)compat_entry,
+-					    &msg_sys, flags, datagrams);
++					    &msg_sys, flags & ~MSG_WAITFORONE,
++					    datagrams);
+ 			if (err < 0)
+ 				break;
+ 			err = __put_user(err, &compat_entry->msg_len);
+ 			++compat_entry;
+ 		} else {
+ 			err = __sys_recvmsg(sock, (struct msghdr __user *)entry,
+-					    &msg_sys, flags, datagrams);
++					    &msg_sys, flags & ~MSG_WAITFORONE,
++					    datagrams);
+ 			if (err < 0)
+ 				break;
+ 			err = put_user(err, &entry->msg_len);