summaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000/e1000.h
diff options
context:
space:
mode:
authorJesse Brandeburg <jesse.brandeburg@intel.com>2010-09-22 18:22:17 +0000
committerDavid S. Miller <davem@davemloft.net>2010-09-23 14:33:37 -0700
commit5cf42fcda0fdddfe7f5ea8629cb7b820bf7e91ab (patch)
treebd9221e2e5d612bebda4a1a29efc42682a7a8f5f /drivers/net/e1000/e1000.h
parent7b872a55c40b7e6f5e257c252f96dde911bd7b2f (diff)
downloadop-kernel-dev-5cf42fcda0fdddfe7f5ea8629cb7b820bf7e91ab.zip
op-kernel-dev-5cf42fcda0fdddfe7f5ea8629cb7b820bf7e91ab.tar.gz
e1000: use work queues
E1000 is using several timers that in a follow on patch will need to acquire the rtnl_lock in order to be safe. This patch moves the timer bodies into work queues which will allow the next patch to add rtnl_lock. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000/e1000.h')
-rw-r--r--drivers/net/e1000/e1000.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
index 99288b9..a881dd0 100644
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -310,6 +310,9 @@ struct e1000_adapter {
int need_ioport;
bool discarding;
+
+ struct work_struct fifo_stall_task;
+ struct work_struct phy_info_task;
};
enum e1000_state_t {
OpenPOWER on IntegriCloud