From: Jason Wang <jasowang@redhat.com>
Date: Fri, 22 Sep 2017 06:38:58 +0000 (+0800)
Subject: virtio-net: correctly set xdp_xmit for mergeable buffer
X-Git-Tag: v4.15-rc1~84^2~658
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd5437974964c759570d68e50ce13c313808f79a;p=thirdparty%2Fkernel%2Flinux.git

virtio-net: correctly set xdp_xmit for mergeable buffer

We should set xdp_xmit only when xdp_do_redirect() succeed.

Cc: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index f6c1f135a0241..dd14a45479321 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -721,7 +721,7 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,
 			goto xdp_xmit;
 		case XDP_REDIRECT:
 			err = xdp_do_redirect(dev, &xdp, xdp_prog);
-			if (err)
+			if (!err)
 				*xdp_xmit = true;
 			rcu_read_unlock();
 			goto xdp_xmit;