3.4-stable patches

added patches:
	vhost-fix-mergeable-bufs-on-be-hosts.patch

diff --git a/queue-3.4/series b/queue-3.4/series
index 64b1721a809a4e884bef82a6cb1eecd909c1f5f8..645f55efb31258933172503a2a7e15d7e528f374 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -31,3 +31,4 @@ usb-mos7840-fix-urb-leak-at-release.patch
 usb-mos7840-fix-port-device-leak-in-error-path.patch
 usb-mos7840-remove-null-urb-submission.patch
 usb-mos7840-remove-invalid-disconnect-handling.patch
+vhost-fix-mergeable-bufs-on-be-hosts.patch

diff --git a/queue-3.4/vhost-fix-mergeable-bufs-on-be-hosts.patch b/queue-3.4/vhost-fix-mergeable-bufs-on-be-hosts.patch
new file mode 100644 (file)
index 0000000..d396588
--- /dev/null
+++ b/queue-3.4/vhost-fix-mergeable-bufs-on-be-hosts.patch
@@ -0,0 +1,33 @@
+From 910a578f7e9400a78a3b13aba0b4d2df16a2cb05 Mon Sep 17 00:00:00 2001
+From: "Michael S. Tsirkin" <mst@redhat.com>
+Date: Wed, 24 Oct 2012 20:37:51 +0200
+Subject: vhost: fix mergeable bufs on BE hosts
+
+From: "Michael S. Tsirkin" <mst@redhat.com>
+
+commit 910a578f7e9400a78a3b13aba0b4d2df16a2cb05 upstream.
+
+We copy head count to a 16 bit field, this works by chance on LE but on
+BE guest gets 0. Fix it up.
+
+Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
+Tested-by: Alexander Graf <agraf@suse.de>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/vhost/net.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/vhost/net.c
++++ b/drivers/vhost/net.c
+@@ -376,7 +376,8 @@ static void handle_rx(struct vhost_net *
+               .hdr.gso_type = VIRTIO_NET_HDR_GSO_NONE
+       };
+       size_t total_len = 0;
+-      int err, headcount, mergeable;
++      int err, mergeable;
++      s16 headcount;
+       size_t vhost_hlen, sock_hlen;
+       size_t vhost_len, sock_len;
+       /* TODO: check that we are running from vhost_worker? */