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.2.33~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e18dbfae927d33d746f6bf8b14f2d030c12b3ba7;p=thirdparty%2Fkernel%2Fstable.git

vhost: fix mergeable bufs on BE hosts

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: Ben Hutchings <ben@decadent.org.uk>
---

diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 882a51fe7b3c8..b76071e12ce1d 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -371,7 +371,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? */