2 files changed, 7 insertions, 6 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 58eb802584b9..1ed2b66a10a6 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1691,13 +1691,13 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
                 kfree_skb(skb);
                 return NET_RX_DROP;
         }
-        skb_scrub_packet(skb);
         skb->protocol = eth_type_trans(skb, dev);
 
         /* eth_type_trans() can set pkt_type.
-         * clear pkt_type _after_ calling eth_type_trans()
+         * call skb_scrub_packet() after it to clear pkt_type _after_ calling
+         * eth_type_trans().
          */
-        skb->pkt_type = PACKET_HOST;
+        skb_scrub_packet(skb);
 
         return netif_rx(skb);
 }
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
index 9fdf8a6d95f3..fbc1094964bf 100644
--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
@@ -454,15 +454,16 @@ int ip_tunnel_rcv(struct ip_tunnel *tunnel, struct sk_buff *skb,
         tstats->rx_bytes += skb->len;
         u64_stats_update_end(&tstats->syncp);
 
-        if (tunnel->net != dev_net(tunnel->dev))
-                skb_scrub_packet(skb);
-
         if (tunnel->dev->type == ARPHRD_ETHER) {
                 skb->protocol = eth_type_trans(skb, tunnel->dev);
                 skb_postpull_rcsum(skb, eth_hdr(skb), ETH_HLEN);
         } else {
                 skb->dev = tunnel->dev;
         }
+
+        if (tunnel->net != dev_net(tunnel->dev))
+                skb_scrub_packet(skb);
+
         gro_cells_receive(&tunnel->gro_cells, skb);
         return 0;