Michael S. Tsirkin
2014-Nov-30 15:11 UTC
[PATCH v7 33/46] vhost/net: larger header for virtio 1.0
Signed-off-by: Michael S. Tsirkin <mst at redhat.com> Reviewed-by: Jason Wang <jasowang at redhat.com> --- drivers/vhost/net.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index cae22f9..1ac58d0 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -1027,7 +1027,8 @@ static int vhost_net_set_features(struct vhost_net *n, u64 features) size_t vhost_hlen, sock_hlen, hdr_len; int i; - hdr_len = (features & (1 << VIRTIO_NET_F_MRG_RXBUF)) ? + hdr_len = (features & ((1ULL << VIRTIO_NET_F_MRG_RXBUF) | + (1ULL << VIRTIO_F_VERSION_1))) ? sizeof(struct virtio_net_hdr_mrg_rxbuf) : sizeof(struct virtio_net_hdr); if (features & (1 << VHOST_NET_F_VIRTIO_NET_HDR)) { -- MST
Cornelia Huck
2014-Dec-01 12:35 UTC
[PATCH v7 33/46] vhost/net: larger header for virtio 1.0
On Sun, 30 Nov 2014 17:11:59 +0200 "Michael S. Tsirkin" <mst at redhat.com> wrote:> Signed-off-by: Michael S. Tsirkin <mst at redhat.com> > Reviewed-by: Jason Wang <jasowang at redhat.com> > --- > drivers/vhost/net.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) >Reviewed-by: Cornelia Huck <cornelia.huck at de.ibm.com>
Possibly Parallel Threads
- [PATCH v6 33/46] vhost/net: larger header for virtio 1.0
- [PATCH v6 33/46] vhost/net: larger header for virtio 1.0
- [PATCH v7 33/46] vhost/net: larger header for virtio 1.0
- [PATCH v3 29/41] vhost/net: larger header for virtio 1.0
- [PATCH v4 30/42] vhost/net: larger header for virtio 1.0