diff --git a/[refs] b/[refs] index 3bcfee85a83e..182e076ce1f2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 03a980d162eb48a79ce21d47f45b9ec7d9db20e9 +refs/heads/master: 1db9e29bb0ff3c9366e8a50fb09ca8dbc364bfd6 diff --git a/trunk/net/8021q/vlan_core.c b/trunk/net/8021q/vlan_core.c index 654e45f5719d..c67fe6f75653 100644 --- a/trunk/net/8021q/vlan_core.c +++ b/trunk/net/8021q/vlan_core.c @@ -121,8 +121,10 @@ int vlan_gro_frags(struct napi_struct *napi, struct vlan_group *grp, if (!skb) return NET_RX_DROP; - if (netpoll_rx_on(skb)) + if (netpoll_rx_on(skb)) { + skb->protocol = eth_type_trans(skb, skb->dev); return vlan_hwaccel_receive_skb(skb, grp, vlan_tci); + } return napi_frags_finish(napi, skb, vlan_gro_common(napi, grp, vlan_tci, skb));