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 {