From: David S. Miller <davem@davemloft.net>
Date: Mon, 17 Aug 2020 18:48:05 +0000 (-0700)
Subject: Revert "net: xdp: pull ethernet header off packet after computing skb->protocol"
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7f9bf6e82461b97ce43a912cb4a959c5a41367ac;p=linux.git

Revert "net: xdp: pull ethernet header off packet after computing skb->protocol"

This reverts commit f8414a8d886b613b90d9fdf7cda6feea313b1069.

eth_type_trans() does the necessary pull on the skb.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/core/dev.c b/net/core/dev.c
index 7592d7dd61097..b5d1129d83103 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4676,7 +4676,6 @@ static u32 netif_receive_generic_xdp(struct sk_buff *skb,
 	    (orig_bcast != is_multicast_ether_addr_64bits(eth->h_dest))) {
 		__skb_push(skb, ETH_HLEN);
 		skb->protocol = eth_type_trans(skb, skb->dev);
-		__skb_pull(skb, ETH_HLEN);
 	}
 
 	switch (act) {