bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed opening device.

This commit is contained in:
Florian Pose 2012-01-25 17:44:35 +01:00
parent 07c9af0696
commit c78001a0b2
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devices/r8169-2.6.35-ethercat.c
View File

@ -3214,6 +3214,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
// offer device to EtherCAT master module
tp->ecdev = ecdev_offer(dev, ec_poll, THIS_MODULE);
tp->ec_watchdog_jiffies = jiffies;
if (!tp->ecdev) {
rc = register_netdev(dev);
@ -3245,6 +3246,11 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
}
pm_runtime_idle(&pdev->dev);
if (tp->ecdev && ecdev_open(tp->ecdev)) {
ecdev_withdraw(tp->ecdev);
goto err_out_msi_4;
}
out:
return rc;
@ -4687,7 +4693,7 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
}
/* Work around for rx fifo overflow */
if (unlikely(status & RxFIFOOver) &&
if (unlikely(!tp->ecdev && (status & RxFIFOOver)) &&
(tp->mac_version == RTL_GIGA_MAC_VER_11)) {
netif_stop_queue(dev);
rtl8169_tx_timeout(dev);