OSDN Git Service

Revert "net: xdp: pull ethernet header off packet after computing skb->protocol"
authorDavid S. Miller <davem@davemloft.net>
Mon, 17 Aug 2020 18:48:05 +0000 (11:48 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 17 Aug 2020 18:48:05 +0000 (11:48 -0700)
This reverts commit f8414a8d886b613b90d9fdf7cda6feea313b1069.

eth_type_trans() does the necessary pull on the skb.

Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/dev.c

index 7592d7d..b5d1129 100644 (file)
@@ -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) {