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