From 02addab506b71d2e5d1d1dbd0429a3e20d23903f Mon Sep 17 00:00:00 2001
From: Robert Olsson <robert.olsson@its.uu.se>
Date: Tue, 25 Nov 2008 16:41:57 -0800
Subject: [PATCH] --- yaml --- r: 122154 b: refs/heads/master c:
 70340d728f4f4cb49da00a11b10ded492260caa5 h: refs/heads/master v: v3

---
 [refs]                  |  2 +-
 trunk/drivers/net/niu.c | 27 ++++++++++++++++++++++++++-
 trunk/drivers/net/niu.h |  1 +
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 79d8fd710dfe..d6105b88d9f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f782db3f5ceee9aa8de6f853969fbec1b8c6e65
+refs/heads/master: 70340d728f4f4cb49da00a11b10ded492260caa5
diff --git a/trunk/drivers/net/niu.c b/trunk/drivers/net/niu.c
index a8d10630f804..f368e7472133 100644
--- a/trunk/drivers/net/niu.c
+++ b/trunk/drivers/net/niu.c
@@ -5847,17 +5847,42 @@ static void niu_stop_hw(struct niu *np)
 	niu_reset_rx_channels(np);
 }
 
+static void niu_set_irq_name(struct niu *np)
+{
+	int port = np->port;
+	int i, j = 1;
+
+	sprintf(np->irq_name[0], "%s:MAC", np->dev->name);
+
+	if (port == 0) {
+		sprintf(np->irq_name[1], "%s:MIF", np->dev->name);
+		sprintf(np->irq_name[2], "%s:SYSERR", np->dev->name);
+		j = 3;
+	}
+
+	for (i = 0; i < np->num_ldg - j; i++) {
+		if (i < np->num_rx_rings)
+			sprintf(np->irq_name[i+j], "%s-rx-%d",
+				np->dev->name, i);
+		else if (i < np->num_tx_rings + np->num_rx_rings)
+			sprintf(np->irq_name[i+j], "%s-tx-%d", np->dev->name,
+				i - np->num_rx_rings);
+	}
+}
+
 static int niu_request_irq(struct niu *np)
 {
 	int i, j, err;
 
+	niu_set_irq_name(np);
+
 	err = 0;
 	for (i = 0; i < np->num_ldg; i++) {
 		struct niu_ldg *lp = &np->ldg[i];
 
 		err = request_irq(lp->irq, niu_interrupt,
 				  IRQF_SHARED | IRQF_SAMPLE_RANDOM,
-				  np->dev->name, lp);
+				  np->irq_name[i], lp);
 		if (err)
 			goto out_free_irqs;
 
diff --git a/trunk/drivers/net/niu.h b/trunk/drivers/net/niu.h
index 180ca8ae93de..cf449aad7f15 100644
--- a/trunk/drivers/net/niu.h
+++ b/trunk/drivers/net/niu.h
@@ -3243,6 +3243,7 @@ struct niu {
 #define NIU_FLAGS_XMAC			0x00010000 /* 0=BMAC 1=XMAC */
 
 	u32				msg_enable;
+	char                            irq_name[NIU_NUM_RXCHAN+NIU_NUM_TXCHAN+3][IFNAMSIZ + 6];
 
 	/* Protects hw programming, and ring state.  */
 	spinlock_t			lock;