Commit 59ba3b1a authored by Xuan Zhuo's avatar Xuan Zhuo Committed by Jakub Kicinski
Browse files

virtio_net: merge: remove skip_xdp 



Now, the logic of merge xdp process is simple, we can remove the
skip_xdp.

Signed-off-by: default avatarXuan Zhuo <xuanzhuo@linux.alibaba.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d8f2835a

drivers/net/virtio_net.c

+10 −13
Original line number Diff line number Diff line
@@ -1382,7 +1382,6 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, 
	struct page *page = virt_to_head_page(buf);

	int offset = buf - page_address(page);

	struct sk_buff *head_skb, *curr_skb;

	struct bpf_prog *xdp_prog;

	unsigned int truesize = mergeable_ctx_to_truesize(ctx);

	unsigned int headroom = mergeable_ctx_to_headroom(ctx);

	unsigned int tailroom = headroom ? sizeof(struct skb_shared_info) : 0;
@@ -1398,10 +1397,8 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, 
		goto err_skb;

	}



	if (likely(!vi->xdp_enabled)) {

		xdp_prog = NULL;

		goto skip_xdp;

	}

	if (unlikely(vi->xdp_enabled)) {

		struct bpf_prog *xdp_prog;



		rcu_read_lock();

		xdp_prog = rcu_dereference(rq->xdp_prog);
@@ -1412,8 +1409,8 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, 
			return head_skb;

		}

		rcu_read_unlock();

	}



skip_xdp:

	head_skb = page_to_skb(vi, rq, page, offset, len, truesize, headroom);

	curr_skb = head_skb;