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

davem330 · davem330 · commit 7f9bf6e82461 · 2020-08-17T11:48:05.000-07:00
This reverts commit f8414a8. 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
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -4676,7 +4676,6 @@ static u32 netif_receive_generic_xdp(struct sk_buff *skb,`
`4676`	`4676`	`(orig_bcast != is_multicast_ether_addr_64bits(eth->h_dest))) {`
`4677`	`4677`	`__skb_push(skb, ETH_HLEN);`
`4678`	`4678`	`skb->protocol = eth_type_trans(skb, skb->dev);`
`4679`		`- __skb_pull(skb, ETH_HLEN);`
`4680`	`4679`	`}`
`4681`	`4680`
`4682`	`4681`	`switch (act) {`