|
@@ -1613,7 +1613,6 @@ static struct sk_buff *tun_build_skb(struct tun_struct *tun,
|
|
|
unsigned int delta = 0;
|
|
|
char *buf;
|
|
|
size_t copied;
|
|
|
- bool xdp_xmit = false;
|
|
|
int err, pad = TUN_RX_PAD;
|
|
|
|
|
|
rcu_read_lock();
|
|
@@ -1671,8 +1670,14 @@ static struct sk_buff *tun_build_skb(struct tun_struct *tun,
|
|
|
preempt_enable();
|
|
|
return NULL;
|
|
|
case XDP_TX:
|
|
|
- xdp_xmit = true;
|
|
|
- /* fall through */
|
|
|
+ get_page(alloc_frag->page);
|
|
|
+ alloc_frag->offset += buflen;
|
|
|
+ if (tun_xdp_xmit(tun->dev, &xdp))
|
|
|
+ goto err_redirect;
|
|
|
+ tun_xdp_flush(tun->dev);
|
|
|
+ rcu_read_unlock();
|
|
|
+ preempt_enable();
|
|
|
+ return NULL;
|
|
|
case XDP_PASS:
|
|
|
delta = orig_data - xdp.data;
|
|
|
break;
|
|
@@ -1699,14 +1704,6 @@ static struct sk_buff *tun_build_skb(struct tun_struct *tun,
|
|
|
get_page(alloc_frag->page);
|
|
|
alloc_frag->offset += buflen;
|
|
|
|
|
|
- if (xdp_xmit) {
|
|
|
- skb->dev = tun->dev;
|
|
|
- generic_xdp_tx(skb, xdp_prog);
|
|
|
- rcu_read_unlock();
|
|
|
- preempt_enable();
|
|
|
- return NULL;
|
|
|
- }
|
|
|
-
|
|
|
rcu_read_unlock();
|
|
|
preempt_enable();
|
|
|
|