dev: move skb_scrub_packet() after eth_type_trans()

skb_scrub_packet() was called before eth_type_trans() to let eth_type_trans()
set pkt_type.

In fact, we should force pkt_type to PACKET_HOST, so move the call after
eth_type_trans().

Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 3 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);
 }