diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2012-10-24 20:37:51 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-31 09:51:36 -0700 |
| commit | 83dab4684482147564c9f3219f58e45d11765875 (patch) | |
| tree | 0c1a9eb411a96de25002251d666fbc763cd5c7a3 | |
| parent | 713b9c260ba25938606ab794a1dfc438c727eb2c (diff) | |
| download | kernel_samsung_crespo-83dab4684482147564c9f3219f58e45d11765875.zip kernel_samsung_crespo-83dab4684482147564c9f3219f58e45d11765875.tar.gz kernel_samsung_crespo-83dab4684482147564c9f3219f58e45d11765875.tar.bz2 | |
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>
| -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 e224a92..f274826 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? */ |