---

yaml --- r: 129765 b: refs/heads/master c: f17f5c9 h: refs/heads/master i: 129763: 9fea6f5 v: v3
git-mirror · Jan 14, 2009 · 038def2 · 038def2
1 parent 24ade22
commit 038def2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 483a2b3a3182abcb7fcea986d7ea13e793bb00b1
+refs/heads/master: f17f5c91ae3bfeb5cfc37fa132a5fdfceb8927be
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -2392,6 +2392,9 @@ int dev_gro_receive(struct napi_struct *napi, struct sk_buff *skb)
 	if (!(skb->dev->features & NETIF_F_GRO))
 		goto normal;
 
+	if (skb_is_gso(skb) || skb_shinfo(skb)->frag_list)
+		goto normal;
+
 	rcu_read_lock();
 	list_for_each_entry_rcu(ptype, head, list) {
 		struct sk_buff *p;