diff options
| author | Auke Kok <auke-jan.h.kok@intel.com> | 2007-05-16 01:49:46 -0700 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-05-17 20:43:15 -0400 |
| commit | e94bd23f67c87011f012f26ca0af3fcf6878eeac (patch) | |
| tree | 59bd2c79007363beee0c50084e63f7840999bdfa /drivers/net/e1000/e1000.h | |
| parent | fb136c070bfdde11dc79758674f54fb26bba1a2f (diff) | |
| download | blackbird-op-linux-e94bd23f67c87011f012f26ca0af3fcf6878eeac.tar.gz blackbird-op-linux-e94bd23f67c87011f012f26ca0af3fcf6878eeac.zip | |
e1000: Fix msi enable leak on error, don't print error message, cleanup
pci_enable_msi failure is a normal event so we should not print any error.
Going over the code I spotted a missing pci_disable_msi() leak when irq
allocation fails. The whole code also needed a cleanup, so I combined the
two different calls to pci_request_irq into a single call making this
look a lot better. All #ifdef CONFIG_PCI_MSI's have been removed.
Compile tested with both CONFIG_PCI_MSI enabled and disabled.
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Cc: H. Peter Anvin <hpa@zytor.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 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h index a9ea67e75c1b..16a6edfeba41 100644 --- a/drivers/net/e1000/e1000.h +++ b/drivers/net/e1000/e1000.h @@ -333,11 +333,9 @@ struct e1000_adapter { struct e1000_tx_ring test_tx_ring; struct e1000_rx_ring test_rx_ring; - int msg_enable; -#ifdef CONFIG_PCI_MSI boolean_t have_msi; -#endif + /* to not mess up cache alignment, always add to the bottom */ boolean_t tso_force; boolean_t smart_power_down; /* phy smart power down */ |
