From 48d757b27d36b1146fb9fe5eacc538e78137d70e Mon Sep 17 00:00:00 2001
From: Alexander Duyck <alexander.h.duyck@intel.com>
Date: Thu, 12 Feb 2009 18:17:42 +0000
Subject: [PATCH] --- yaml --- r: 134575 b: refs/heads/master c:
 56fbbb4e619f4bf604c350e3948a291bda759101 h: refs/heads/master i:   134573:
 23f3def0180fe53546d4e007cb958539bb47bd5b   134571:
 18fef1bc72020ba8c323006276a077361eafb097   134567:
 5b7c03bc28f470b4ad553bdbfea21b7dc411dcb9   134559:
 a9eda0604c50de202b8889c34c154b65c3b42288 v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/net/igb/igb_main.c | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 37eb707542a7..82dbdaf38c2f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e5c3d218ac19d5a5e9b3a8f09777c2b555b2499
+refs/heads/master: 56fbbb4e619f4bf604c350e3948a291bda759101
diff --git a/trunk/drivers/net/igb/igb_main.c b/trunk/drivers/net/igb/igb_main.c
index 86782f9218a7..c259013fe7b2 100644
--- a/trunk/drivers/net/igb/igb_main.c
+++ b/trunk/drivers/net/igb/igb_main.c
@@ -2059,17 +2059,11 @@ static void igb_configure_rx(struct igb_adapter *adapter)
 	} else {
 		/* Enable Receive Checksum Offload for TCP and UDP */
 		rxcsum = rd32(E1000_RXCSUM);
-		if (adapter->rx_csum) {
-			rxcsum |= E1000_RXCSUM_TUOFL;
+		if (adapter->rx_csum)
+			rxcsum |= E1000_RXCSUM_TUOFL | E1000_RXCSUM_IPPCSE;
+		else
+			rxcsum &= ~(E1000_RXCSUM_TUOFL | E1000_RXCSUM_IPPCSE);
 
-			/* Enable IPv4 payload checksum for UDP fragments
-			 * Must be used in conjunction with packet-split. */
-			if (adapter->rx_ps_hdr_size)
-				rxcsum |= E1000_RXCSUM_IPPCSE;
-		} else {
-			rxcsum &= ~E1000_RXCSUM_TUOFL;
-			/* don't need to clear IPPCSE as it defaults to 0 */
-		}
 		wr32(E1000_RXCSUM, rxcsum);
 	}