aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-03-20 05:27:41 -0400
committerDavid S. Miller <davem@davemloft.net>2009-03-20 05:27:41 -0400
commit2b1c4354de72ced917d2f3fe88117613f992234b (patch)
tree3e7643cad45d94e3c331366418532043bd4fa5a9 /drivers/net/bnx2.c
parent5e140dfc1fe87eae27846f193086724806b33c7d (diff)
parent170ebf85160dd128e1c4206cc197cce7d1424705 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/virtio_net.c
Diffstat (limited to 'drivers/net/bnx2.c')
-rw-r--r--drivers/net/bnx2.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 8466d351a70..ad446db8e18 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -57,8 +57,8 @@
57 57
58#define DRV_MODULE_NAME "bnx2" 58#define DRV_MODULE_NAME "bnx2"
59#define PFX DRV_MODULE_NAME ": " 59#define PFX DRV_MODULE_NAME ": "
60#define DRV_MODULE_VERSION "1.9.2" 60#define DRV_MODULE_VERSION "1.9.3"
61#define DRV_MODULE_RELDATE "Feb 11, 2009" 61#define DRV_MODULE_RELDATE "March 17, 2009"
62 62
63#define RUN_AT(x) (jiffies + (x)) 63#define RUN_AT(x) (jiffies + (x))
64 64
@@ -5855,9 +5855,6 @@ bnx2_enable_msix(struct bnx2 *bp, int msix_vecs)
5855 for (i = 0; i < BNX2_MAX_MSIX_VEC; i++) { 5855 for (i = 0; i < BNX2_MAX_MSIX_VEC; i++) {
5856 msix_ent[i].entry = i; 5856 msix_ent[i].entry = i;
5857 msix_ent[i].vector = 0; 5857 msix_ent[i].vector = 0;
5858
5859 snprintf(bp->irq_tbl[i].name, len, "%s-%d", dev->name, i);
5860 bp->irq_tbl[i].handler = bnx2_msi_1shot;
5861 } 5858 }
5862 5859
5863 rc = pci_enable_msix(bp->pdev, msix_ent, BNX2_MAX_MSIX_VEC); 5860 rc = pci_enable_msix(bp->pdev, msix_ent, BNX2_MAX_MSIX_VEC);
@@ -5866,8 +5863,11 @@ bnx2_enable_msix(struct bnx2 *bp, int msix_vecs)
5866 5863
5867 bp->irq_nvecs = msix_vecs; 5864 bp->irq_nvecs = msix_vecs;
5868 bp->flags |= BNX2_FLAG_USING_MSIX | BNX2_FLAG_ONE_SHOT_MSI; 5865 bp->flags |= BNX2_FLAG_USING_MSIX | BNX2_FLAG_ONE_SHOT_MSI;
5869 for (i = 0; i < BNX2_MAX_MSIX_VEC; i++) 5866 for (i = 0; i < BNX2_MAX_MSIX_VEC; i++) {
5870 bp->irq_tbl[i].vector = msix_ent[i].vector; 5867 bp->irq_tbl[i].vector = msix_ent[i].vector;
5868 snprintf(bp->irq_tbl[i].name, len, "%s-%d", dev->name, i);
5869 bp->irq_tbl[i].handler = bnx2_msi_1shot;
5870 }
5871} 5871}
5872 5872
5873static void 5873static void