diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2012-10-24 20:37:51 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-10-25 05:19:30 +0200 |
| commit | 910a578f7e9400a78a3b13aba0b4d2df16a2cb05 (patch) | |
| tree | 761ccdf0279f31f298e070211ea3bd98c3c0f0da | |
| parent | gianfar_ptp: use iomem, not ioports resource tree in probe (diff) | |
| download | linux-910a578f7e9400a78a3b13aba0b4d2df16a2cb05.tar.xz linux-910a578f7e9400a78a3b13aba0b4d2df16a2cb05.zip | |
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>
| -rw-r--r-- | drivers/vhost/net.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 072cbbadbc36..7f93f34b7f91 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? */ |