equal
deleted
inserted
replaced
5766 void ec_poll(struct net_device *netdev) |
5766 void ec_poll(struct net_device *netdev) |
5767 { |
5767 { |
5768 struct e1000_adapter *adapter = netdev_priv(netdev); |
5768 struct e1000_adapter *adapter = netdev_priv(netdev); |
5769 |
5769 |
5770 if (jiffies - adapter->ec_watchdog_jiffies >= 2 * HZ) { |
5770 if (jiffies - adapter->ec_watchdog_jiffies >= 2 * HZ) { |
5771 e1000_watchdog((unsigned long) adapter); |
5771 struct e1000_hw *hw = &adapter->hw; |
|
5772 hw->mac.get_link_status = true; |
|
5773 e1000_watchdog_task(&adapter->watchdog_task); |
5772 adapter->ec_watchdog_jiffies = jiffies; |
5774 adapter->ec_watchdog_jiffies = jiffies; |
5773 } |
5775 } |
5774 |
5776 |
5775 #ifdef CONFIG_PCI_MSI |
5777 #ifdef CONFIG_PCI_MSI |
5776 e1000_intr_msi(0,netdev); |
5778 e1000_intr_msi(0, netdev); |
5777 #else |
5779 #else |
5778 e1000_intr(0,netdev); |
5780 e1000_intr(0, netdev); |
5779 #endif |
5781 #endif |
5780 } |
5782 } |
5781 |
5783 |
5782 /** |
5784 /** |
5783 * e1000_probe - Device Initialization Routine |
5785 * e1000_probe - Device Initialization Routine |
6066 if (!(adapter->flags & FLAG_HAS_AMT)) |
6068 if (!(adapter->flags & FLAG_HAS_AMT)) |
6067 e1000_get_hw_control(adapter); |
6069 e1000_get_hw_control(adapter); |
6068 |
6070 |
6069 adapter->ecdev = ecdev_offer(netdev, ec_poll, THIS_MODULE); |
6071 adapter->ecdev = ecdev_offer(netdev, ec_poll, THIS_MODULE); |
6070 if (adapter->ecdev) { |
6072 if (adapter->ecdev) { |
|
6073 adapter->ec_watchdog_jiffies = jiffies; |
6071 if (ecdev_open(adapter->ecdev)) { |
6074 if (ecdev_open(adapter->ecdev)) { |
6072 ecdev_withdraw(adapter->ecdev); |
6075 ecdev_withdraw(adapter->ecdev); |
6073 goto err_register; |
6076 goto err_register; |
6074 } |
6077 } |
6075 } else { |
6078 } else { |