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 10:03:01 -0700 |
| commit | 02b21626c5e97ab2286ed5b5a7e35181b16b9382 (patch) | |
| tree | e11a38339e56adc0b19fae79d2a6b2610dfe8919 | |
| parent | 8d649dd97f1ec8fd9c8ffd94877c5c806a202e8a (diff) | |
| download | lwn-02b21626c5e97ab2286ed5b5a7e35181b16b9382.tar.gz lwn-02b21626c5e97ab2286ed5b5a7e35181b16b9382.zip | |
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 5c170100de9c..4134e53d7311 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -376,7 +376,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? */ |