Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

1 files changed, 4 insertions, 0 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 5927f6a7c301..f2bfd2eda7b2 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5664,6 +5664,10 @@ static void napi_reuse_skb(struct napi_struct *napi, struct sk_buff *skb)
         __vlan_hwaccel_clear_tag(skb);
         skb->dev = napi->dev;
         skb->skb_iif = 0;
+
+        /* eth_type_trans() assumes pkt_type is PACKET_HOST */
+        skb->pkt_type = PACKET_HOST;
+
         skb->encapsulation = 0;
         skb_shinfo(skb)->gso_type = 0;
         skb->truesize = SKB_TRUESIZE(skb_end_offset(skb));