From 123fec9c5d2caa1f388ee4af9e3f289594aa58b3 Mon Sep 17 00:00:00 2001
From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Fri, 19 Sep 2008 02:58:50 +0200
Subject: [PATCH] --- yaml --- r: 111901 b: refs/heads/master c:
 170e7108a368c52df1ec466966fd1db6e45a7ad2 h: refs/heads/master i:   111899:
 e4b60ac1e0502c78eb4933f7999781c4d4d269d5 v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/net/mv643xx_eth.c | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 55bb9b8fd466..f77b2b13eeb8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 457b1d5a4b7b8c2b3b6bd032098da600c50dd6b2
+refs/heads/master: 170e7108a368c52df1ec466966fd1db6e45a7ad2
diff --git a/trunk/drivers/net/mv643xx_eth.c b/trunk/drivers/net/mv643xx_eth.c
index 408827de7d3e..94c13be292a3 100644
--- a/trunk/drivers/net/mv643xx_eth.c
+++ b/trunk/drivers/net/mv643xx_eth.c
@@ -546,11 +546,8 @@ static int rxq_process(struct rx_queue *rxq, int budget)
 			 */
 			skb_put(skb, byte_cnt - 2 - 4);
 
-			if (cmd_sts & LAYER_4_CHECKSUM_OK) {
+			if (cmd_sts & LAYER_4_CHECKSUM_OK)
 				skb->ip_summed = CHECKSUM_UNNECESSARY;
-				skb->csum = htons(
-					(cmd_sts & 0x0007fff8) >> 3);
-			}
 			skb->protocol = eth_type_trans(skb, mp->dev);
 			netif_receive_skb(skb);
 		}
@@ -1994,9 +1991,10 @@ static void port_start(struct mv643xx_eth_private *mp)
 
 	/*
 	 * Receive all unmatched unicast, TCP, UDP, BPDU and broadcast
-	 * frames to RX queue #0.
+	 * frames to RX queue #0, and include the pseudo-header when
+	 * calculating receive checksums.
 	 */
-	wrl(mp, PORT_CONFIG(mp->port_num), 0x00000000);
+	wrl(mp, PORT_CONFIG(mp->port_num), 0x02000000);
 
 	/*
 	 * Treat BPDUs as normal multicasts, and disable partition mode.