diff options
| author | David S. Miller <davem@davemloft.net> | 2020-08-17 20:48:05 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-08-17 20:48:05 +0200 |
| commit | 7f9bf6e82461b97ce43a912cb4a959c5a41367ac (patch) | |
| tree | e55b787b7f7af7a2723ff4e35ccf45d812c3ac35 | |
| parent | phylink: <linux/phylink.h>: fix function prototype kernel-doc warning (diff) | |
| download | linux-7f9bf6e82461b97ce43a912cb4a959c5a41367ac.tar.xz linux-7f9bf6e82461b97ce43a912cb4a959c5a41367ac.zip | |
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>
| -rw-r--r-- | net/core/dev.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 7592d7dd6109..b5d1129d8310 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) { |