summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/broadcom
diff options
context:
space:
mode:
authorNithin Sujir <nsujir@broadcom.com>2013-09-20 16:47:00 -0700
committerDavid S. Miller <davem@davemloft.net>2013-09-21 14:04:52 -0400
commit21e315e15dfc5b392998352e9c3492b8a58672c1 (patch)
tree838955ce15751f833ae3798d5eb7e04e7d4d59b6 /drivers/net/ethernet/broadcom
parent4bc814ab71951cab2dd745c08772ed2eb849a5f8 (diff)
downloadblackbird-op-linux-21e315e15dfc5b392998352e9c3492b8a58672c1.tar.gz
blackbird-op-linux-21e315e15dfc5b392998352e9c3492b8a58672c1.zip
tg3: Appropriately classify interrupts during request_irq
Distinguish between tx, rx and txrx interrupts. Signed-off-by: Nithin Nayak Sujir <nsujir@broadcom.com> Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom')
-rw-r--r--drivers/net/ethernet/broadcom/tg3.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 00431bcefc41..6fd86457630a 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -11039,7 +11039,18 @@ static int tg3_request_irq(struct tg3 *tp, int irq_num)
name = tp->dev->name;
else {
name = &tnapi->irq_lbl[0];
- snprintf(name, IFNAMSIZ, "%s-%d", tp->dev->name, irq_num);
+ if (tnapi->tx_buffers && tnapi->rx_rcb)
+ snprintf(name, IFNAMSIZ,
+ "%s-txrx-%d", tp->dev->name, irq_num);
+ else if (tnapi->tx_buffers)
+ snprintf(name, IFNAMSIZ,
+ "%s-tx-%d", tp->dev->name, irq_num);
+ else if (tnapi->rx_rcb)
+ snprintf(name, IFNAMSIZ,
+ "%s-rx-%d", tp->dev->name, irq_num);
+ else
+ snprintf(name, IFNAMSIZ,
+ "%s-%d", tp->dev->name, irq_num);
name[IFNAMSIZ-1] = 0;
}
OpenPOWER on IntegriCloud