1 files changed, 14 insertions, 0 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 0b2d777e5b9e..ec96f50b0782 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4258,6 +4258,9 @@ static u32 netif_receive_generic_xdp(struct sk_buff *skb,
         struct netdev_rx_queue *rxqueue;
         void *orig_data, *orig_data_end;
         u32 metalen, act = XDP_DROP;
+        __be16 orig_eth_type;
+        struct ethhdr *eth;
+        bool orig_bcast;
         int hlen, off;
         u32 mac_len;
 
@@ -4298,6 +4301,9 @@ static u32 netif_receive_generic_xdp(struct sk_buff *skb,
         xdp->data_hard_start = skb->data - skb_headroom(skb);
         orig_data_end = xdp->data_end;
         orig_data = xdp->data;
+        eth = (struct ethhdr *)xdp->data;
+        orig_bcast = is_multicast_ether_addr_64bits(eth->h_dest);
+        orig_eth_type = eth->h_proto;
 
         rxqueue = netif_get_rxqueue(skb);
         xdp->rxq = &rxqueue->xdp_rxq;
@@ -4321,6 +4327,14 @@ static u32 netif_receive_generic_xdp(struct sk_buff *skb,
 
         }
 
+        /* check if XDP changed eth hdr such SKB needs update */
+        eth = (struct ethhdr *)xdp->data;
+        if ((orig_eth_type != eth->h_proto) ||
+            (orig_bcast != is_multicast_ether_addr_64bits(eth->h_dest))) {
+                __skb_push(skb, ETH_HLEN);
+                skb->protocol = eth_type_trans(skb, skb->dev);
+        }
+
         switch (act) {
         case XDP_REDIRECT:
         case XDP_TX: