diff --git a/[refs] b/[refs] index dbe61f0e25e5..4f9d4cc9ca11 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d4bd947c501ea1da81300280fb6aeec2cca9335 +refs/heads/master: e76b69cc0133952c98aa1ad6330cacacd269fd64 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index d1cf53d0d597..1968980f513a 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -2813,7 +2813,7 @@ gro_result_t napi_frags_finish(struct napi_struct *napi, struct sk_buff *skb, switch (ret) { case GRO_NORMAL: case GRO_HELD: - skb->protocol = eth_type_trans(skb, napi->dev); + skb->protocol = eth_type_trans(skb, skb->dev); if (ret == GRO_HELD) skb_gro_pull(skb, -ETH_HLEN);