From 89c64c5118092fc8501d1e4fe9d1572dc9076fde Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@osdl.org>
Date: Fri, 9 Dec 2005 11:35:11 -0800
Subject: [PATCH] --- yaml --- r: 15804 b: refs/heads/master c:
 75d070c56fa77913b165947f046304efcd38e516 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/sky2.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e883a0fb6b11..ac68f3152237 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 585b56012f08a6edc598d17b28a6c434134bfaff
+refs/heads/master: 75d070c56fa77913b165947f046304efcd38e516
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
index cdcbf727f884..b9c0aafb0316 100644
--- a/trunk/drivers/net/sky2.c
+++ b/trunk/drivers/net/sky2.c
@@ -2926,7 +2926,13 @@ static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw,
 	sky2->duplex = -1;
 	sky2->speed = -1;
 	sky2->advertising = sky2_supported_modes(hw);
-	sky2->rx_csum = 1;
+
+ 	/* Receive checksum disabled for Yukon XL
+	 * because of observed problems with incorrect
+	 * values when multiple packets are received in one interrupt
+	 */
+	sky2->rx_csum = (hw->chip_id != CHIP_ID_YUKON_XL);
+
 	INIT_WORK(&sky2->phy_task, sky2_phy_task, sky2);
 	init_MUTEX(&sky2->phy_sema);
 	sky2->tx_pending = TX_DEF_PENDING;