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.0.50~9
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=83dab4684482147564c9f3219f58e45d11765875;p=karo-tx-linux.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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index e224a92baa16..f27482630ba3 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -305,7 +305,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? */