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

Fixed link detection in older e1000e drivers.

This commit is contained in:
Florian Pose 2013-01-11 15:07:11 +01:00
parent 032acb3d85
commit b0564237b2
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devices/e1000e/netdev-2.6.37-ethercat.c
View File

@ -5768,14 +5768,16 @@ void ec_poll(struct net_device *netdev)
struct e1000_adapter *adapter = netdev_priv(netdev);
if (jiffies - adapter->ec_watchdog_jiffies >= 2 * HZ) {
e1000_watchdog((unsigned long) adapter);
struct e1000_hw *hw = &adapter->hw;
hw->mac.get_link_status = true;
e1000_watchdog_task(&adapter->watchdog_task);
adapter->ec_watchdog_jiffies = jiffies;
}
#ifdef CONFIG_PCI_MSI
e1000_intr_msi(0,netdev);
e1000_intr_msi(0, netdev);
#else
e1000_intr(0,netdev);
e1000_intr(0, netdev);
#endif
}
@ -6068,6 +6070,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
adapter->ecdev = ecdev_offer(netdev, ec_poll, THIS_MODULE);
if (adapter->ecdev) {
adapter->ec_watchdog_jiffies = jiffies;
if (ecdev_open(adapter->ecdev)) {
ecdev_withdraw(adapter->ecdev);
goto err_register;

9
devices/e1000e/netdev-3.2-ethercat.c
View File

@ -6050,14 +6050,16 @@ void ec_poll(struct net_device *netdev)
struct e1000_adapter *adapter = netdev_priv(netdev);
if (jiffies - adapter->ec_watchdog_jiffies >= 2 * HZ) {
e1000_watchdog((unsigned long) adapter);
struct e1000_hw *hw = &adapter->hw;
hw->mac.get_link_status = true;
e1000_watchdog_task(&adapter->watchdog_task);
adapter->ec_watchdog_jiffies = jiffies;
}
#ifdef CONFIG_PCI_MSI
e1000_intr_msi(0,netdev);
e1000_intr_msi(0, netdev);
#else
e1000_intr(0,netdev);
e1000_intr(0, netdev);
#endif
}
@ -6359,6 +6361,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
adapter->ecdev = ecdev_offer(netdev, ec_poll, THIS_MODULE);
if (adapter->ecdev) {
adapter->ec_watchdog_jiffies = jiffies;
if (ecdev_open(adapter->ecdev)) {
ecdev_withdraw(adapter->ecdev);
goto err_register;