From: Michael S. Tsirkin <mst@redhat.com>
Date: Wed, 24 Oct 2012 18:37:51 +0000 (+0200)
Subject: vhost: fix mergeable bufs on BE hosts
X-Git-Tag: v3.7-rc3~7^2~8
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;ds=sidebyside;h=910a578f7e9400a78a3b13aba0b4d2df16a2cb05;p=~andy%2Flinux

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@redhat.com>
Tested-by: Alexander Graf <agraf@suse.de>
Cc: stable@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 072cbbadbc3..7f93f34b7f9 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -379,7 +379,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? */