Virtualization - Oct 2012 - [PATCH repost for-3.7] vhost: fix mergeable bufs on BE hosts

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 at redhat.com>
Tested-by: Alexander Graf <agraf at suse.de>
Cc: stable at vger.kernel.org

---

Repost fixing up To/Cc list.

 drivers/vhost/net.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 9ab6d47..2bb463c 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -448,7 +448,8 @@ static void handle_rx(struct vhost_net *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? */
-- 
MST

From: "Michael S. Tsirkin" <mst at redhat.com>
Date: Wed, 24 Oct 2012 20:37:51 +0200
> 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 at redhat.com>
> Tested-by: Alexander Graf <agraf at suse.de>
> Cc: stable at vger.kernel.org
Applied, thanks.