bnx2: Rename MSI-X vectors.
Subsystems (2)
PATCH 1/2 bnx2: Rename MSI-X vectors.
Change MSI-X vector names to "ethx-%d".
Signed-off-by Michael Chan <[email protected]>
Signed-off-by Benjamin Li <[email protected]>
--- drivers/net/bnx2.c | 4 +++- drivers/net/bnx2.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/net/bnx2.c +3 -1
@@ -5827,6 +5827,8 @@ bnx2_enable_msix(struct bnx2 *bp, int msix_vecs) {int i, rc;struct msix_entry msix_ent[BNX2_MAX_MSIX_VEC ]; +struct net_device *dev = bp->dev; +const int len =sizeof (bp->irq_tbl[0 ].name);bnx2_setup_msix_tbl (bp);REG_WR (bp,BNX2_PCI_MSIX_CONTROL ,BNX2_MAX_MSIX_HW_VEC -1 );
@@ -5837,7 +5839,7 @@ bnx2_enable_msix(struct bnx2 *bp, int msix_vecs) msix_ent[i].entry = i; msix_ent[i].vector =0 ; -strcpy (bp->irq_tbl[i].name, bp->dev->name); +snprintf (bp->irq_tbl[i].name, len,"%s-%d" , dev->name, i); bp->irq_tbl[i].handler = bnx2_msi_1shot; }
drivers/net/bnx2.h +1 -1
@@ -6627,7 +6627,7 @@ struct bnx2_irq {irq_handler_t handler;unsigned int vector;u8 requested; -char name[16 ]; +char name[IFNAMSIZ +2 ]; };struct bnx2_tx_ring_info {
Signature · 1 line
1.5.6.GIT
PATCH 2/2 bnx2: Update version to 1.9.0.
And fix the 5716S pci_device_id entry to point to the proper string.
Signed-off-by Michael Chan <[email protected]>
--- drivers/net/bnx2.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/bnx2.c +3 -3
@@ -57,8 +57,8 @@#define DRV_MODULE_NAME "bnx2"#define PFX DRV_MODULE_NAME ": " -#define DRV_MODULE_VERSION "1.8.2" -#define DRV_MODULE_RELDATE "Nov 10, 2008" +#define DRV_MODULE_VERSION "1.9.0" +#define DRV_MODULE_RELDATE "Dec 16, 2008"#define RUN_AT (x) (jiffies + (x))
@@ -131,7 +131,7 @@ static DEFINE_PCI_DEVICE_TABLE(bnx2_pci_tbl) = { {PCI_VENDOR_ID_BROADCOM ,0x163b , PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5716 }, { PCI_VENDOR_ID_BROADCOM, 0x163c, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5716 }, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5716S }, { 0, } };
Signature · 1 line
1.5.6.GIT
David Miller
maintainerRe: [PATCH net-next 2/2] bnx2: Update version to 1.9.0.
From: "Michael Chan" <[email protected]>
Date: Tue, 16 Dec 2008 18:18:35 -0800
Quoted 3 lines
And fix the 5716S
pci_device_identry to point to the proper string.Signed-off-by Michael Chan <[email protected]>
Also applied, thanks Michael.
From: "Michael Chan" <[email protected]>
Date: Tue, 16 Dec 2008 18:18:34 -0800
Quoted 4 lines
Change MSI-X vector names to "ethx-%d".
Signed-off-by Michael Chan <[email protected]>Signed-off-by Benjamin Li <[email protected]>
Applied.