diff options
| author | Michael Chan | 2008-12-17 05:27:45 +0100 |
|---|---|---|
| committer | David S. Miller | 2008-12-17 05:27:45 +0100 |
| commit | 4e1d0de95c55383f598516ebf82969260c18e4bd (patch) | |
| tree | cf990d6d5f86cffc323e2d82883204b729296dbe | |
| parent | drivers/net/hamradio: Move a dereference below a NULL test (diff) | |
| download | kernel-qcow2-linux-4e1d0de95c55383f598516ebf82969260c18e4bd.tar.gz kernel-qcow2-linux-4e1d0de95c55383f598516ebf82969260c18e4bd.tar.xz kernel-qcow2-linux-4e1d0de95c55383f598516ebf82969260c18e4bd.zip | |
bnx2: Rename MSI-X vectors.
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>
| -rw-r--r-- | drivers/net/bnx2.c | 4 | ||||
| -rw-r--r-- | drivers/net/bnx2.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 0e2218dadb3d..6ba2fecd89fc 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c @@ -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; } diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h index 2f43c45b7ad6..88f962bff2d3 100644 --- a/drivers/net/bnx2.h +++ b/drivers/net/bnx2.h @@ -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 { |