Messages in this thread | | | Subject | Re: [PATCH net 2/9] virtio-net: correctly xmit linearized page on XDP_TX | From | John Fastabend <> | Date | Fri, 23 Dec 2016 07:47:33 -0800 |
| |
On 16-12-23 06:37 AM, Jason Wang wrote: > After we linearize page, we should xmit this page instead of the page > of first buffer which may lead unexpected result. With this patch, we > can see correct packet during XDP_TX. > > Cc: John Fastabend <john.r.fastabend@intel.com> > Signed-off-by: Jason Wang <jasowang@redhat.com> > --- > drivers/net/virtio_net.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index 1067253..fe4562d 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -572,7 +572,7 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, > if (unlikely(hdr->hdr.gso_type || hdr->hdr.flags)) > goto err_xdp; > > - act = do_xdp_prog(vi, rq, xdp_prog, page, offset, len); > + act = do_xdp_prog(vi, rq, xdp_prog, xdp_page, offset, len); > switch (act) { > case XDP_PASS: > if (unlikely(xdp_page != page)) >
Thanks clumsy merge conflict resolution between v4 and v6 versions :/
Acked-by: John Fastabend <john.r.fastabend@intel.com>
| |