Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 910a578f authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by David S. Miller
Browse files

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: default avatarMichael S. Tsirkin <mst@redhat.com>
Tested-by: default avatarAlexander Graf <agraf@suse.de>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2b9c128e

drivers/vhost/net.c

+2 −1
Original line number Diff line number Diff line
@@ -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? */