[ 071/101] vhost: fix mergeable bufs on BE hosts
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: 2012-10-29 22:04:31
Also in:
lkml
3.6-stable review patch. If anyone has any objections, please let me know. ------------------ 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 <redacted> 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@@ -379,7 +379,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? */