diff options
author | Michael Chan <mchan@broadcom.com> | 2007-12-20 22:56:09 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 17:57:34 -0500 |
commit | 6d866ffc69b0c3e584782f212a3f783708d31e9a (patch) | |
tree | b8a25c8fe7b53344b82c3c07eda5109c832a2b31 /drivers/net/bnx2.h | |
parent | ead7270b993bed77cb45a5bc786a879679e2b16a (diff) |
[BNX2]: Restructure IRQ datastructures.
Add a table to keep track of multiple IRQs and restructure the IRQ
request and free functions so that they can be easily expanded to
handle multiple IRQs.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2.h')
-rw-r--r-- | drivers/net/bnx2.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h index 1f244faf3624..1accf0093126 100644 --- a/drivers/net/bnx2.h +++ b/drivers/net/bnx2.h | |||
@@ -6494,6 +6494,15 @@ struct flash_spec { | |||
6494 | u8 *name; | 6494 | u8 *name; |
6495 | }; | 6495 | }; |
6496 | 6496 | ||
6497 | #define BNX2_MAX_MSIX_HW_VEC 9 | ||
6498 | #define BNX2_MAX_MSIX_VEC 1 | ||
6499 | |||
6500 | struct bnx2_irq { | ||
6501 | irq_handler_t handler; | ||
6502 | u16 vector; | ||
6503 | char name[16]; | ||
6504 | }; | ||
6505 | |||
6497 | struct bnx2 { | 6506 | struct bnx2 { |
6498 | /* Fields used in the tx and intr/napi performance paths are grouped */ | 6507 | /* Fields used in the tx and intr/napi performance paths are grouped */ |
6499 | /* together in the beginning of the structure. */ | 6508 | /* together in the beginning of the structure. */ |
@@ -6721,6 +6730,9 @@ struct bnx2 { | |||
6721 | u32 flash_size; | 6730 | u32 flash_size; |
6722 | 6731 | ||
6723 | int status_stats_size; | 6732 | int status_stats_size; |
6733 | |||
6734 | struct bnx2_irq irq_tbl[BNX2_MAX_MSIX_VEC]; | ||
6735 | int irq_nvecs; | ||
6724 | }; | 6736 | }; |
6725 | 6737 | ||
6726 | static u32 bnx2_reg_rd_ind(struct bnx2 *bp, u32 offset); | 6738 | static u32 bnx2_reg_rd_ind(struct bnx2 *bp, u32 offset); |