From 9a299aa73e72f7975a8cf50646827efab6e61833 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue, 26 May 2009 18:50:31 +0000
Subject: [PATCH] --- yaml --- r: 150523 b: refs/heads/master c:
 cb18978cbf454c236db5e4191a12ef71eef9b3a0 h: refs/heads/master i:   150521:
 74a9185dd241b461587957e493a1bad4d65174f2   150519:
 f04679a1f4743c7aeaee8cd7933644c89186ade7 v: v3

---
 [refs]               |  2 +-
 trunk/net/core/dev.c | 23 +++++++++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 6807b311a3c7..a6125b8fadf8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1075f3f65d0e0f49351b7d4310e9f94483972a51
+refs/heads/master: cb18978cbf454c236db5e4191a12ef71eef9b3a0
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index cd29e613bc5a..ed4550fd9ece 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -2452,10 +2452,25 @@ int dev_gro_receive(struct napi_struct *napi, struct sk_buff *skb)
 	ret = GRO_HELD;
 
 pull:
-	if (unlikely(!pskb_may_pull(skb, skb_gro_offset(skb)))) {
-		if (napi->gro_list == skb)
-			napi->gro_list = skb->next;
-		ret = GRO_DROP;
+	if (skb_headlen(skb) < skb_gro_offset(skb)) {
+		int grow = skb_gro_offset(skb) - skb_headlen(skb);
+
+		BUG_ON(skb->end - skb->tail < grow);
+
+		memcpy(skb_tail_pointer(skb), NAPI_GRO_CB(skb)->frag0, grow);
+
+		skb->tail += grow;
+		skb->data_len -= grow;
+
+		skb_shinfo(skb)->frags[0].page_offset += grow;
+		skb_shinfo(skb)->frags[0].size -= grow;
+
+		if (unlikely(!skb_shinfo(skb)->frags[0].size)) {
+			put_page(skb_shinfo(skb)->frags[0].page);
+			memmove(skb_shinfo(skb)->frags,
+				skb_shinfo(skb)->frags + 1,
+				--skb_shinfo(skb)->nr_frags);
+		}
 	}
 
 ok: