From 73c11dcdced6e2d566f62eb94f5166f1370f2483 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Sat, 17 Jan 2009 19:48:13 +0000
Subject: [PATCH] --- yaml --- r: 130163 b: refs/heads/master c:
 37fe4732b978eb02e5433387a40f2b61706cebe3 h: refs/heads/master i:   130161:
 a5483d7852cb09d8cb96cbc0b7c771bf6c3185f5   130159:
 e5b0bc7eb205f9ea85f6623f98fa94c102729b63 v: v3

---
 [refs]                  | 2 +-
 trunk/net/core/skbuff.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index fb73f58a083d..e900a5cb4ed3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a8e47ffd95608f0768e1a8a0225c822aa53aa9b
+refs/heads/master: 37fe4732b978eb02e5433387a40f2b61706cebe3
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
index 56272ac6dfd8..2e5f2ca3bdcd 100644
--- a/trunk/net/core/skbuff.c
+++ b/trunk/net/core/skbuff.c
@@ -2585,8 +2585,9 @@ int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb)
 	struct sk_buff *nskb;
 	unsigned int headroom;
 	unsigned int hlen = p->data - skb_mac_header(p);
+	unsigned int len = skb->len;
 
-	if (hlen + p->len + skb->len >= 65536)
+	if (hlen + p->len + len >= 65536)
 		return -E2BIG;
 
 	if (skb_shinfo(p)->frag_list)
@@ -2648,9 +2649,9 @@ int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb)
 
 done:
 	NAPI_GRO_CB(p)->count++;
-	p->data_len += skb->len;
-	p->truesize += skb->len;
-	p->len += skb->len;
+	p->data_len += len;
+	p->truesize += len;
+	p->len += len;
 
 	NAPI_GRO_CB(skb)->same_flow = 1;
 	return 0;