From: Jason Wang <jasowang@redhat.com>
Date: Wed, 12 Sep 2018 11:17:00 +0800
Subject: tuntap: switch to use XDP_PACKET_HEADROOM
Patch-mainline: v4.20-rc1
Git-commit: 4f23aff8713c1f98735f7290a2cde63845b7ec88
References: bsc#1109837
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
drivers/net/tun.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -112,7 +112,6 @@ do { \
} while (0)
#endif
-#define TUN_HEADROOM 256
#define TUN_RX_PAD (NET_IP_ALIGN + NET_SKB_PAD)
/* TUN device flags */
@@ -1609,7 +1608,7 @@ static struct sk_buff *tun_build_skb(str
rcu_read_lock();
xdp_prog = rcu_dereference(tun->xdp_prog);
if (xdp_prog)
- pad += TUN_HEADROOM;
+ pad += XDP_PACKET_HEADROOM;
buflen += SKB_DATA_ALIGN(len + pad);
rcu_read_unlock();