summaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000/e1000.h
diff options
context:
space:
mode:
authorAuke Kok <auke\-jan.h.kok@intel.com>2006-09-27 12:54:02 -0700
committerAuke Kok <juke-jan.h.kok@intel.com>2006-09-27 12:54:02 -0700
commit1314bbf3a3d911218fc153e14873e2e384d08084 (patch)
tree4b2517261087f6d1374fe84272dcf20cd184f701 /drivers/net/e1000/e1000.h
parent4f5f2317fbb3655edae21de3ada0f1692523eeef (diff)
downloadblackbird-op-linux-1314bbf3a3d911218fc153e14873e2e384d08084.tar.gz
blackbird-op-linux-1314bbf3a3d911218fc153e14873e2e384d08084.zip
e1000: driver state fixes (race fix)
We were plagued by our interrupt handler posting a watchdog event which could occur when our adapter was going down in case a late packet arrived just before e1000_down() finished. This caused the watchdog timer to start after the NIC was down and keep rescheduling it every N seconds. Once the driver unloaded it would panic. Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Diffstat (limited to 'drivers/net/e1000/e1000.h')
-rw-r--r--drivers/net/e1000/e1000.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
index a9501e7b8ef9..7ecce438d258 100644
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -345,8 +345,9 @@ struct e1000_adapter {
};
enum e1000_state_t {
- __E1000_DRIVER_TESTING,
+ __E1000_TESTING,
__E1000_RESETTING,
+ __E1000_DOWN
};
#endif /* _E1000_H_ */
OpenPOWER on IntegriCloud