lkml.org 
[lkml]   [2014]   [Dec]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH v8 26/50] virtio_net: bigger header when VERSION_1 is set
    With VERSION_1 virtio_net uses same header size
    whether mergeable buffers are enabled or not.

    Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
    Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
    Reviewed-by: Jason Wang <jasowang@redhat.com>
    ---
    drivers/net/virtio_net.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
    index 098f443..a0e64cf 100644
    --- a/drivers/net/virtio_net.c
    +++ b/drivers/net/virtio_net.c
    @@ -1805,7 +1805,8 @@ static int virtnet_probe(struct virtio_device *vdev)
    if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF))
    vi->mergeable_rx_bufs = true;

    - if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF))
    + if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF) ||
    + virtio_has_feature(vdev, VIRTIO_F_VERSION_1))
    vi->hdr_len = sizeof(struct virtio_net_hdr_mrg_rxbuf);
    else
    vi->hdr_len = sizeof(struct virtio_net_hdr);
    --
    MST


    \
     
     \ /
      Last update: 2014-12-01 17:41    [W:4.022 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site