From 3e12a326dd6a3167df0f7d2af98fef828531ae39 Mon Sep 17 00:00:00 2001 From: Michael Chan Date: Wed, 18 Mar 2009 18:11:51 -0700 Subject: [PATCH] --- yaml --- r: 132535 b: refs/heads/master c: 690103137267e9ed893febf7ff061af63e8235a9 h: refs/heads/master i: 132533: e494524a3d9bcea1bb258975171d6b1c644a2808 132531: 968a8985d39a8c25b45c84d4ec1db7066d5e70cc 132527: 8ef94cd027650c76222785fd8f2bd5d13e278fbf v: v3 --- [refs] | 2 +- trunk/drivers/net/bnx2.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index ff887c6c2fbb..7856e7ce0317 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f10023a4ef3f5cc05457b059c6880bc447adfa1f +refs/heads/master: 690103137267e9ed893febf7ff061af63e8235a9 diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c index 6500b7c4739f..6b6530ffdf19 100644 --- a/trunk/drivers/net/bnx2.c +++ b/trunk/drivers/net/bnx2.c @@ -57,8 +57,8 @@ #define DRV_MODULE_NAME "bnx2" #define PFX DRV_MODULE_NAME ": " -#define DRV_MODULE_VERSION "1.9.2" -#define DRV_MODULE_RELDATE "Feb 11, 2009" +#define DRV_MODULE_VERSION "1.9.3" +#define DRV_MODULE_RELDATE "March 17, 2009" #define RUN_AT(x) (jiffies + (x)) @@ -5843,9 +5843,6 @@ bnx2_enable_msix(struct bnx2 *bp, int msix_vecs) for (i = 0; i < BNX2_MAX_MSIX_VEC; i++) { msix_ent[i].entry = i; msix_ent[i].vector = 0; - - snprintf(bp->irq_tbl[i].name, len, "%s-%d", dev->name, i); - bp->irq_tbl[i].handler = bnx2_msi_1shot; } rc = pci_enable_msix(bp->pdev, msix_ent, BNX2_MAX_MSIX_VEC); @@ -5854,8 +5851,11 @@ bnx2_enable_msix(struct bnx2 *bp, int msix_vecs) bp->irq_nvecs = msix_vecs; bp->flags |= BNX2_FLAG_USING_MSIX | BNX2_FLAG_ONE_SHOT_MSI; - for (i = 0; i < BNX2_MAX_MSIX_VEC; i++) + for (i = 0; i < BNX2_MAX_MSIX_VEC; i++) { bp->irq_tbl[i].vector = msix_ent[i].vector; + snprintf(bp->irq_tbl[i].name, len, "%s-%d", dev->name, i); + bp->irq_tbl[i].handler = bnx2_msi_1shot; + } } static void