lkml.org 
[lkml]   [2014]   [Nov]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH v6 33/46] vhost/net: larger header for virtio 1.0


On Fri, Nov 28, 2014 at 4:10 AM, Michael S. Tsirkin <mst@redhat.com>
wrote:
> Signed-off-by: Michael S. Tsirkin <mst@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
>

Reviewed-by: Jason Wang <jasowang@redhat.com>



\
 
 \ /
  Last update: 2014-11-28 10:21    [W:0.223 / U:0.768 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site