1 files changed, 6 insertions, 5 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 8ffc52e01ece..7e00a7342ee6 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -131,6 +131,7 @@
 #include <linux/static_key.h>
 #include <linux/hashtable.h>
 #include <linux/vmalloc.h>
+#include <linux/if_macvlan.h>
 
 #include "net-sysfs.h"
 
@@ -1424,6 +1425,10 @@ void dev_disable_lro(struct net_device *dev)
         if (is_vlan_dev(dev))
                 dev = vlan_dev_real_dev(dev);
 
+        /* the same for macvlan devices */
+        if (netif_is_macvlan(dev))
+                dev = macvlan_dev_real_dev(dev);
+
         dev->wanted_features &= ~NETIF_F_LRO;
         netdev_update_features(dev);
 
@@ -1690,13 +1695,9 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
                 kfree_skb(skb);
                 return NET_RX_DROP;
         }
-        skb->protocol = eth_type_trans(skb, dev);
 
-        /* eth_type_trans() can set pkt_type.
-         * call skb_scrub_packet() after it to clear pkt_type _after_ calling
-         * eth_type_trans().
-         */
         skb_scrub_packet(skb, true);
+        skb->protocol = eth_type_trans(skb, dev);
 
         return netif_rx(skb);
 }