From 7f31c8232790aff926ad39a56eb45b53e6ae2595 Mon Sep 17 00:00:00 2001
From: Li RongQing <roy.qing.li@gmail.com>
Date: Sun, 17 Mar 2013 22:34:48 +0000
Subject: [PATCH] --- yaml --- r: 368303 b: refs/heads/master c:
 9a18dd15e2ec934d8265009d3882955dcc059a49 h: refs/heads/master i:   368301:
 1ec393f49b6d658d6c2f1d79139f40ab64ad0278   368299:
 5ec0f64755c4c89ab71397a420031bef5422f515   368295:
 a31d0beead76f49dba629ae70b42be0715a1b654   368287:
 e6b996eb0582141a170c259863dc3b61d7c0800e v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/net/ethernet/neterion/s2io.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 4540fc14fbd9..74ff8cf2e95a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a2c6181c4a1922021b4d7df373bba612c3e5f04
+refs/heads/master: 9a18dd15e2ec934d8265009d3882955dcc059a49
diff --git a/trunk/drivers/net/ethernet/neterion/s2io.c b/trunk/drivers/net/ethernet/neterion/s2io.c
index bfd887382e19..3371ff41bb34 100644
--- a/trunk/drivers/net/ethernet/neterion/s2io.c
+++ b/trunk/drivers/net/ethernet/neterion/s2io.c
@@ -80,6 +80,7 @@
 #include <linux/slab.h>
 #include <linux/prefetch.h>
 #include <net/tcp.h>
+#include <net/checksum.h>
 
 #include <asm/div64.h>
 #include <asm/irq.h>
@@ -8337,16 +8338,13 @@ static void update_L3L4_header(struct s2io_nic *sp, struct lro *lro)
 {
 	struct iphdr *ip = lro->iph;
 	struct tcphdr *tcp = lro->tcph;
-	__sum16 nchk;
 	struct swStat *swstats = &sp->mac_control.stats_info->sw_stat;
 
 	DBG_PRINT(INFO_DBG, "%s: Been here...\n", __func__);
 
 	/* Update L3 header */
+	csum_replace2(&ip->check, ip->tot_len, htons(lro->total_len));
 	ip->tot_len = htons(lro->total_len);
-	ip->check = 0;
-	nchk = ip_fast_csum((u8 *)lro->iph, ip->ihl);
-	ip->check = nchk;
 
 	/* Update L4 header */
 	tcp->ack_seq = lro->tcp_ack;