equal
deleted
inserted
replaced
6048 void ec_poll(struct net_device *netdev) |
6048 void ec_poll(struct net_device *netdev) |
6049 { |
6049 { |
6050 struct e1000_adapter *adapter = netdev_priv(netdev); |
6050 struct e1000_adapter *adapter = netdev_priv(netdev); |
6051 |
6051 |
6052 if (jiffies - adapter->ec_watchdog_jiffies >= 2 * HZ) { |
6052 if (jiffies - adapter->ec_watchdog_jiffies >= 2 * HZ) { |
6053 e1000_watchdog((unsigned long) adapter); |
6053 struct e1000_hw *hw = &adapter->hw; |
|
6054 hw->mac.get_link_status = true; |
|
6055 e1000_watchdog_task(&adapter->watchdog_task); |
6054 adapter->ec_watchdog_jiffies = jiffies; |
6056 adapter->ec_watchdog_jiffies = jiffies; |
6055 } |
6057 } |
6056 |
6058 |
6057 #ifdef CONFIG_PCI_MSI |
6059 #ifdef CONFIG_PCI_MSI |
6058 e1000_intr_msi(0,netdev); |
6060 e1000_intr_msi(0, netdev); |
6059 #else |
6061 #else |
6060 e1000_intr(0,netdev); |
6062 e1000_intr(0, netdev); |
6061 #endif |
6063 #endif |
6062 } |
6064 } |
6063 |
6065 |
6064 /** |
6066 /** |
6065 * e1000_probe - Device Initialization Routine |
6067 * e1000_probe - Device Initialization Routine |
6357 if (!(adapter->flags & FLAG_HAS_AMT)) |
6359 if (!(adapter->flags & FLAG_HAS_AMT)) |
6358 e1000e_get_hw_control(adapter); |
6360 e1000e_get_hw_control(adapter); |
6359 |
6361 |
6360 adapter->ecdev = ecdev_offer(netdev, ec_poll, THIS_MODULE); |
6362 adapter->ecdev = ecdev_offer(netdev, ec_poll, THIS_MODULE); |
6361 if (adapter->ecdev) { |
6363 if (adapter->ecdev) { |
|
6364 adapter->ec_watchdog_jiffies = jiffies; |
6362 if (ecdev_open(adapter->ecdev)) { |
6365 if (ecdev_open(adapter->ecdev)) { |
6363 ecdev_withdraw(adapter->ecdev); |
6366 ecdev_withdraw(adapter->ecdev); |
6364 goto err_register; |
6367 goto err_register; |
6365 } |
6368 } |
6366 } else { |
6369 } else { |