2210 		       dev->dev_addr[4], dev->dev_addr[5], xid, dev->irq);

  2210 		       dev->dev_addr[4], dev->dev_addr[5], xid, dev->irq);

  2211 	}

  2211 	}

  2212 

  2212 

  2213 	rtl8169_init_phy(dev, tp);

  2213 	rtl8169_init_phy(dev, tp);

  2214 	device_set_wakeup_enable(&pdev->dev, tp->features & RTL_FEATURE_WOL);

  2214 	device_set_wakeup_enable(&pdev->dev, tp->features & RTL_FEATURE_WOL);

  2215 	if (tp->ecdev && ecdev_open(tp->ecdev)) {

  2216 	if (tp->ecdev && ecdev_open(tp->ecdev)) {

  2216 		ecdev_withdraw(tp->ecdev);

  2217 		ecdev_withdraw(tp->ecdev);

  2217 		goto err_out_msi_5;

  2218 		goto err_out_msi_5;

  2218 	}

  2219 	}

  2220 

  2220 

  2221 out:

  2221 out:

  2222 	return rc;

  2222 	return rc;

  2223 

  2223 

  2224 err_out_msi_5:

  2224 err_out_msi_5:

  2425 static void rtl_hw_start_8169(struct net_device *dev)

  2425 static void rtl_hw_start_8169(struct net_device *dev)

  2426 {

  2426 {

  2427 	struct rtl8169_private *tp = netdev_priv(dev);

  2427 	struct rtl8169_private *tp = netdev_priv(dev);

  2428 	void __iomem *ioaddr = tp->mmio_addr;

  2428 	void __iomem *ioaddr = tp->mmio_addr;

  2429 	struct pci_dev *pdev = tp->pci_dev;

  2429 	struct pci_dev *pdev = tp->pci_dev;

  2432 

  2430 

  2433 	if (tp->mac_version == RTL_GIGA_MAC_VER_05) {

  2431 	if (tp->mac_version == RTL_GIGA_MAC_VER_05) {

  2434 		RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) | PCIMulRW);

  2432 		RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) | PCIMulRW);

  2435 		pci_write_config_byte(pdev, PCI_CACHE_LINE_SIZE, 0x08);

  2433 		pci_write_config_byte(pdev, PCI_CACHE_LINE_SIZE, 0x08);

  2436 	}

  2434 	}