diff options
author | Jesse Brandeburg <jesse.brandeburg@intel.com> | 2008-03-21 14:06:58 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2008-03-26 00:17:52 -0400 |
commit | 9150b76a6439b60e678ccb6376ee3686a2f76767 (patch) | |
tree | dbef93cb3dd8668a805536dde9e354e2d4970d6d /drivers/net/e1000/e1000.h | |
parent | 74ef9c39db952355ed379f28b8907bae8ff1abe9 (diff) |
e1000: remove irq_sem
irq_sem was just a hack to prevent interrupts from being enabled
unexpectedly in deep call paths. Simply finding those call paths and
fixing them by hand results in a driver that behaves as we expect and
doesn't need the atomic at all.
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/e1000/e1000.h')
-rw-r--r-- | drivers/net/e1000/e1000.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h index d73a6c1fbcff..a05aa51ecfa6 100644 --- a/drivers/net/e1000/e1000.h +++ b/drivers/net/e1000/e1000.h | |||
@@ -249,7 +249,6 @@ struct e1000_adapter { | |||
249 | #ifdef CONFIG_E1000_NAPI | 249 | #ifdef CONFIG_E1000_NAPI |
250 | spinlock_t tx_queue_lock; | 250 | spinlock_t tx_queue_lock; |
251 | #endif | 251 | #endif |
252 | atomic_t irq_sem; | ||
253 | unsigned int total_tx_bytes; | 252 | unsigned int total_tx_bytes; |
254 | unsigned int total_tx_packets; | 253 | unsigned int total_tx_packets; |
255 | unsigned int total_rx_bytes; | 254 | unsigned int total_rx_bytes; |