---

yaml
---
r: 134575
b: refs/heads/master
c: 56fbbb4
h: refs/heads/master
i:
  134573: 23f3def
  134571: 18fef1b
  134567: 5b7c03b
  134559: a9eda06
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e5c3d218ac19d5a5e9b3a8f09777c2b555b2499
+refs/heads/master: 56fbbb4e619f4bf604c350e3948a291bda759101

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);
 	}