On Tue, 25 Nov 2014 18:42:53 +0200 "Michael S. Tsirkin" <[email protected]> wrote:
> virtio 1.0 doesn't use virtio_net_hdr anymore, and in fact, it's not > really useful since virtio_net_hdr_mrg_rxbuf includes that as the first > field anyway. > > Let's drop it, precalculate header len and store within vi instead. > > This way we can also remove struct skb_vnet_hdr. > > Signed-off-by: Michael S. Tsirkin <[email protected]> > --- > drivers/net/virtio_net.c | 90 > ++++++++++++++++++++++-------------------------- > 1 file changed, 41 insertions(+), 49 deletions(-) > > @@ -260,13 +256,11 @@ static struct sk_buff *page_to_skb(struct virtnet_info > *vi, > > hdr = skb_vnet_hdr(skb); > > - if (vi->mergeable_rx_bufs) { > - hdr_len = sizeof hdr->mhdr; > - hdr_padded_len = sizeof hdr->mhdr; > - } else { > - hdr_len = sizeof hdr->hdr; > + hdr_len = vi->hdr_len; > + if (vi->mergeable_rx_bufs) > + hdr_padded_len = sizeof *hdr; sizeof without () looks weird to me. > + else > hdr_padded_len = sizeof(struct padded_vnet_hdr); > - } > > memcpy(hdr, p, hdr_len); > Otherwise: Reviewed-by: Cornelia Huck <[email protected]> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
