Re: [Qemu-devel] [PATCH] virtio-net: put virtio net header inline with data

2013-06-06 Thread Jesse Larrew
On 06/06/2013 03:09 PM, Dave Jones wrote: > On Thu, Jun 06, 2013 at 02:59:44PM -0500, Jesse Larrew wrote: > > > > pr_debug("%s: xmit %p %pM\n", vi->dev->name, skb, dest); > > > +if (vi->mergeable_rx_bufs) > > > +hdr_len = sizeof hdr->mhdr; > > > +else >

Re: [Qemu-devel] [PATCH] virtio-net: put virtio net header inline with data

2013-06-06 Thread Dave Jones
On Thu, Jun 06, 2013 at 02:59:44PM -0500, Jesse Larrew wrote: > >pr_debug("%s: xmit %p %pM\n", vi->dev->name, skb, dest); > > + if (vi->mergeable_rx_bufs) > > + hdr_len = sizeof hdr->mhdr; > > + else > > + hdr_len = sizeof hdr->hdr; > > All conditionals need braces

Re: [Qemu-devel] [PATCH] virtio-net: put virtio net header inline with data

2013-06-06 Thread Jesse Larrew
Hi Michael! On 06/06/2013 04:55 AM, Michael S. Tsirkin wrote: > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index c9e0038..d35a097 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -106,6 +106,9 @@ struct virtnet_info { > /* Has control virt