From 90e8e7ec84776e3c3d514582789504253f67c600 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Wed, 21 Nov 2007 14:55:26 -0800
Subject: [PATCH] --- yaml --- r: 74451 b: refs/heads/master c:
 8b31cfbcd1b54362ef06c85beb40e65a349169a2 h: refs/heads/master i:   74449:
 c7299e43ccc3ed3bfdbe62857dba1f709e900362   74447:
 71a469446e14aaebb8e0f52ad8a7b787902b8e7b v: v3

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

diff --git a/[refs] b/[refs]
index f500ef2efafd..def73bd32002 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58dd8258fccbb68e0d0e1898038442822cb833c0
+refs/heads/master: 8b31cfbcd1b54362ef06c85beb40e65a349169a2
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
index a2070db725c9..8c4c7430d906 100644
--- a/trunk/drivers/net/sky2.c
+++ b/trunk/drivers/net/sky2.c
@@ -1320,15 +1320,11 @@ static int sky2_up(struct net_device *dev)
 	 */
 	if (otherdev && netif_running(otherdev) &&
  	    (cap = pci_find_capability(hw->pdev, PCI_CAP_ID_PCIX))) {
- 		struct sky2_port *osky2 = netdev_priv(otherdev);
  		u16 cmd;
 
 		pci_read_config_word(hw->pdev, cap + PCI_X_CMD, &cmd);
  		cmd &= ~PCI_X_CMD_MAX_SPLIT;
 		pci_write_config_word(hw->pdev, cap + PCI_X_CMD, cmd);
-
- 		sky2->rx_csum = 0;
- 		osky2->rx_csum = 0;
  	}
 
 	if (netif_msg_ifup(sky2))
@@ -4013,7 +4009,7 @@ 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;
+	sky2->rx_csum = (hw->chip_id != CHIP_ID_YUKON_XL);
 	sky2->wol = wol;
 
 	spin_lock_init(&sky2->phy_lock);