From 038def2c737cd8a8b1fe1b28b35cccb4de6466da Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Wed, 14 Jan 2009 14:36:12 -0800
Subject: [PATCH] --- yaml --- r: 129765 b: refs/heads/master c:
 f17f5c91ae3bfeb5cfc37fa132a5fdfceb8927be h: refs/heads/master i:   129763:
 9fea6f556bb41f26865cdbedbead053b318788c5 v: v3

---
 [refs]               | 2 +-
 trunk/net/core/dev.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8fee1c55f0ce..e568fe659714 100644
--- 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
index b715a55cccc4..7dec715293b1 100644
--- 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;