On Thu, Jan 18, 2018 at 09:27:10PM +0800, Yuanhan Liu wrote:
> On Thu, Jan 18, 2018 at 10:07:31AM +0100, Olivier Matz wrote:
> > Fixes: c1f86306a026 ("virtio: add new driver")
> > Cc: sta...@dpdk.org
>
> I would not suggest to include such patch for a stable release. It doesn't
> fix a real issue.
Yes.
I've included it in the patchset to avoid conflicts for backports because it
changes the same code area.
If you prefer, I can send a new patchset with the current 2/3 and 3/3, plus
the typo fix as a individual patch, on top of them.
Does it look good to you?
Thanks
>
> Thanks.
>
> --yliu
> >
> > Signed-off-by: Olivier Matz <olivier.m...@6wind.com>
> > ---
> > drivers/net/virtio/virtio_ethdev.c | 4 ++--
> > drivers/net/virtio/virtqueue.c | 2 +-
> > drivers/net/virtio/virtqueue.h | 2 +-
> > 3 files changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/net/virtio/virtio_ethdev.c
> > b/drivers/net/virtio/virtio_ethdev.c
> > index ec012c2ac..c7426951c 100644
> > --- a/drivers/net/virtio/virtio_ethdev.c
> > +++ b/drivers/net/virtio/virtio_ethdev.c
> > @@ -1879,7 +1879,7 @@ static void virtio_dev_free_mbufs(struct rte_eth_dev
> > *dev)
> > VIRTQUEUE_DUMP(rxvq->vq);
> >
> > PMD_INIT_LOG(DEBUG, "rx_queues[%d]=%p", i, rxvq);
> > - while ((buf = virtqueue_detatch_unused(rxvq->vq)) != NULL) {
> > + while ((buf = virtqueue_detach_unused(rxvq->vq)) != NULL) {
> > rte_pktmbuf_free(buf);
> > mbuf_num++;
> > }
> > @@ -1899,7 +1899,7 @@ static void virtio_dev_free_mbufs(struct rte_eth_dev
> > *dev)
> > VIRTQUEUE_DUMP(txvq->vq);
> >
> > mbuf_num = 0;
> > - while ((buf = virtqueue_detatch_unused(txvq->vq)) != NULL) {
> > + while ((buf = virtqueue_detach_unused(txvq->vq)) != NULL) {
> > rte_pktmbuf_free(buf);
> > mbuf_num++;
> > }
> > diff --git a/drivers/net/virtio/virtqueue.c b/drivers/net/virtio/virtqueue.c
> > index 1ada4fe08..6988bfea4 100644
> > --- a/drivers/net/virtio/virtqueue.c
> > +++ b/drivers/net/virtio/virtqueue.c
> > @@ -16,7 +16,7 @@
> > * 2) mbuf that hasn't been consued by backend.
> > */
> > struct rte_mbuf *
> > -virtqueue_detatch_unused(struct virtqueue *vq)
> > +virtqueue_detach_unused(struct virtqueue *vq)
> > {
> > struct rte_mbuf *cookie;
> > int idx;
> > diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h
> > index fedbaa39c..1288e5287 100644
> > --- a/drivers/net/virtio/virtqueue.h
> > +++ b/drivers/net/virtio/virtqueue.h
> > @@ -270,7 +270,7 @@ void virtqueue_dump(struct virtqueue *vq);
> > /**
> > * Get all mbufs to be freed.
> > */
> > -struct rte_mbuf *virtqueue_detatch_unused(struct virtqueue *vq);
> > +struct rte_mbuf *virtqueue_detach_unused(struct virtqueue *vq);
> >
> > /* Flush the elements in the used ring. */
> > void virtqueue_rxvq_flush(struct virtqueue *vq);
> > --
> > 2.11.0
