Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 910a578f7e9400a78a3b13aba0b4d2df16a2cb05

Authored by Michael S. Tsirkin
Committed by David S. Miller
1 parent 2b9c128e95
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

... ... @@ -379,7 +379,8 @@
379 379 .hdr.gso_type = VIRTIO_NET_HDR_GSO_NONE
380 380 };
381 381 size_t total_len = 0;
382   - int err, headcount, mergeable;
  382 + int err, mergeable;
  383 + s16 headcount;
383 384 size_t vhost_hlen, sock_hlen;
384 385 size_t vhost_len, sock_len;
385 386 /* TODO: check that we are running from vhost_worker? */