summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/intel/e1000e/e1000.h
diff options
context:
space:
mode:
authorDetlev Casanova <detlev.casanova@gmail.com>2019-06-23 06:14:37 +0300
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2019-06-29 02:00:24 +0300
commit59653e6497d16f7ac1d9db088f3959f57ee8c3db (patch)
treef877ae44d048c5745c922f5973c8828a9892a506 /drivers/net/ethernet/intel/e1000e/e1000.h
parent1d8d80b4e4ff641eefa5250cba324dfa5861a9f1 (diff)
downloadlinux-59653e6497d16f7ac1d9db088f3959f57ee8c3db.tar.xz
e1000e: Make watchdog use delayed work
Use delayed work instead of timers to run the watchdog of the e1000e driver. Simplify the code with one less middle function. Signed-off-by: Detlev Casanova <detlev.casanova@gmail.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/e1000.h')
-rw-r--r--drivers/net/ethernet/intel/e1000e/e1000.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h
index be13227f1697..34cd67951aec 100644
--- a/drivers/net/ethernet/intel/e1000e/e1000.h
+++ b/drivers/net/ethernet/intel/e1000e/e1000.h
@@ -186,12 +186,13 @@ struct e1000_phy_regs {
/* board specific private data structure */
struct e1000_adapter {
- struct timer_list watchdog_timer;
struct timer_list phy_info_timer;
struct timer_list blink_timer;
struct work_struct reset_task;
- struct work_struct watchdog_task;
+ struct delayed_work watchdog_task;
+
+ struct workqueue_struct *e1000_workqueue;
const struct e1000_info *ei;