---

yaml --- r: 143448 b: refs/heads/master c: 1db9e29 h: refs/heads/master v: v3
git-mirror · Apr 13, 2009 · 3bc57f8 · 3bc57f8
1 parent 845b186
commit 3bc57f8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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));