From fedd0876a90749d418b50fbed410c8d1d020182e Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@broadcom.com>
Date: Tue, 16 Dec 2008 20:27:45 -0800
Subject: [PATCH] --- yaml --- r: 122747 b: refs/heads/master c:
 4e1d0de95c55383f598516ebf82969260c18e4bd h: refs/heads/master i:   122745:
 5138a85d22d649f6870f64a7f540fcc77eac2fa2   122743:
 4bfbf85183a87500b9d0361555e96751db8b7581 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/bnx2.c | 4 +++-
 trunk/drivers/net/bnx2.h | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b346a95f80a3..2bab702faed9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f40e0638237a2d3e2ce8bedf3af4b3c02cf6fff7
+refs/heads/master: 4e1d0de95c55383f598516ebf82969260c18e4bd
diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c
index 0e2218dadb3d..6ba2fecd89fc 100644
--- a/trunk/drivers/net/bnx2.c
+++ b/trunk/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/trunk/drivers/net/bnx2.h b/trunk/drivers/net/bnx2.h
index 2f43c45b7ad6..88f962bff2d3 100644
--- a/trunk/drivers/net/bnx2.h
+++ b/trunk/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 {