bnx2: Promote vector field in bnx2_irq structure from u16 to unsigned int
authorBenjamin Li <benli@broadcom.com>
Thu, 18 Sep 2008 23:46:11 +0000 (16:46 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 18 Sep 2008 23:46:11 +0000 (16:46 -0700)
The bnx2 driver stores/uses the irq value from the pci_dev internally.
But when it stores the irq value, it has been performing an
integer demotion.  Because of the recent changes made to
arch/x86/kernel/io_apic.c, the new method in creating the irq value
(using build_irq_for_pci_dev()) has exposed this bug on x86 systems.

Because of this demotion when calling request_irq() from
bnx2_request_irq(), the driver would get a return code of -EINVAL.
This is because the kernel could not find the requested irq descriptor.
By storing the irq value properly, the kernel can find the correct
irq descriptor and the bnx2 driver can operate normally.

Signed-off-by: Benjamin Li <benli@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bnx2.h

index c3c579f98ed07d64e877c794502310036af0d3c3..dfacd31f7ed08856cdac5c9c0156f6cef4addd1f 100644 (file)
@@ -6597,7 +6597,7 @@ struct flash_spec {
 
 struct bnx2_irq {
        irq_handler_t   handler;
-       u16             vector;
+       unsigned int    vector;
        u8              requested;
        char            name[16];
 };