aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/netxen/netxen_nic_main.c
diff options
context:
space:
mode:
authorDhananjay Phadke <dhananjay@netxen.com>2009-05-18 21:46:40 -0700
committerDavid S. Miller <davem@davemloft.net>2009-05-18 21:46:40 -0700
commitf67f34084914144de55c785163d047d5d8dddd2d (patch)
tree898d223e49dde9176d3d49a8cf80662b40b3b789 /drivers/net/netxen/netxen_nic_main.c
parentMerge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
downloadlinux-dev-f67f34084914144de55c785163d047d5d8dddd2d.tar.xz
linux-dev-f67f34084914144de55c785163d047d5d8dddd2d.zip
netxen: fix msi irq setup
The pdev->irq was not saved in netxen_adapter, causing request_irq() with invalid irq number. This was broken in commit be339aee634d5cb98a8df8d6febe04002ec497f3 ("netxen: fix irq tear down and msix leak."). Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
-rw-r--r--drivers/net/netxen/netxen_nic_main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 86ca0812dd48..50477f5c3ecb 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -539,6 +539,7 @@ netxen_setup_intr(struct netxen_adapter *adapter)
adapter->msi_tgt_status =
msi_tgt_status[adapter->ahw.pci_func];
dev_info(&pdev->dev, "using msi interrupts\n");
+ adapter->msix_entries[0].vector = pdev->irq;
return;
}