From 2807b22017c23e702b8dd20d71b46ca3da5f0579 Mon Sep 17 00:00:00 2001
From: Eli Cohen <eli@mellanox.co.il>
Date: Fri, 27 Jun 2008 20:09:00 -0700
Subject: [PATCH] --- yaml --- r: 98569 b: refs/heads/master c:
 251a4b320f2352598f84e4452ab538aa8064af52 h: refs/heads/master i:   98567:
 d344f91467a4706679fa59ec0cf95c520a23f137 v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/inet_lro.h | 6 +++++-
 trunk/net/ipv4/inet_lro.c      | 3 +--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 7077810cd609..bb79cf2efe52 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a375803feaadb6c34e0807bd9325885dcca5c00
+refs/heads/master: 251a4b320f2352598f84e4452ab538aa8064af52
diff --git a/trunk/include/linux/inet_lro.h b/trunk/include/linux/inet_lro.h
index 80335b7d77c5..c4335faebb63 100644
--- a/trunk/include/linux/inet_lro.h
+++ b/trunk/include/linux/inet_lro.h
@@ -84,7 +84,11 @@ struct net_lro_mgr {
 				    from received packets and eth protocol
 				    is still ETH_P_8021Q */
 
-	u32 ip_summed;      /* Set in non generated SKBs in page mode */
+	/*
+	 * Set for generated SKBs that are not added to
+	 * the frag list in fragmented mode
+	 */
+	u32 ip_summed;
 	u32 ip_summed_aggr; /* Set in aggregated SKBs: CHECKSUM_UNNECESSARY
 			     * or CHECKSUM_NONE */
 
diff --git a/trunk/net/ipv4/inet_lro.c b/trunk/net/ipv4/inet_lro.c
index 4a4d49fca1f2..cfd034a2b96e 100644
--- a/trunk/net/ipv4/inet_lro.c
+++ b/trunk/net/ipv4/inet_lro.c
@@ -383,8 +383,7 @@ static int __lro_proc_skb(struct net_lro_mgr *lro_mgr, struct sk_buff *skb,
 out2: /* send aggregated SKBs to stack */
 	lro_flush(lro_mgr, lro_desc);
 
-out:  /* Original SKB has to be posted to stack */
-	skb->ip_summed = lro_mgr->ip_summed;
+out:
 	return 1;
 }