Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bnx2: Rename MSI-X vectors.

Browse source 
Change MSI-X vector names to "ethx-%d".

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: Benjamin Li <benli@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Michael Chan 2008-12-16 20:27:45 -08:00 • committed by David S. Miller
parent f40e063823
commit 4e1d0de95c
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/net/bnx2.c
View file

@ -5827,6 +5827,8 @@ bnx2_enable_msix(struct bnx2 *bp, int msix_vecs)
{ {
int i, rc; int i, rc;
struct msix_entry msix_ent[BNX2_MAX_MSIX_VEC]; 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); bnx2_setup_msix_tbl(bp);
REG_WR(bp, BNX2_PCI_MSIX_CONTROL, BNX2_MAX_MSIX_HW_VEC - 1); 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].entry = i;
msix_ent[i].vector = 0; 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; bp->irq_tbl[i].handler = bnx2_msi_1shot;
} }

2
drivers/net/bnx2.h
View file

@ -6627,7 +6627,7 @@ struct bnx2_irq {
irq_handler_t handler; irq_handler_t handler;
unsigned int vector; unsigned int vector;
u8 requested; u8 requested;
char name[16]; char name[IFNAMSIZ + 2];
}; };
struct bnx2_tx_ring_info { struct bnx2_tx_ring_info {