netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Hemminger <shemminger@vyatta.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org
Subject: [RFC 6/7] niu: use netdev_irqname
Date: Tue, 21 Jun 2011 10:05:47 -0700	[thread overview]
Message-ID: <20110621170658.885992666@vyatta.com> (raw)
In-Reply-To: 20110621170541.309890798@vyatta.com

[-- Attachment #1: niu-use-irqname.patch --]
[-- Type: text/plain, Size: 841 bytes --]

This device also has some other IRQ's unrelated to rings
which are named with another convention.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>


--- a/drivers/net/niu.c	2011-06-21 09:57:00.739951363 -0700
+++ b/drivers/net/niu.c	2011-06-21 09:59:22.683951282 -0700
@@ -6048,11 +6048,12 @@ static void niu_set_irq_name(struct niu
 
 	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);
+			netdev_irqname(np->irq_name[i+j], IFNAMSIZ+6,
+				       np->dev, NETIF_IRQ_RX, 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);
+			netdev_irqname(np->irq_name[i+j], IFNAMSIZ+6,
+				       np->dev, NETIF_IRQ_TX,
+				       i - np->num_rx_rings);
 	}
 }
 



  parent reply	other threads:[~2011-06-21 17:07 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-21 17:05 [RFC 0/7] network device irq naming Stephen Hemminger
2011-06-21 17:05 ` [RFC 1/7] netdev: add standardized irq naming function Stephen Hemminger
2011-06-21 17:30   ` Michał Mirosław
2011-06-21 17:48     ` Ben Hutchings
2011-06-21 17:56       ` Stephen Hemminger
2011-06-21 18:07   ` Ben Hutchings
2011-06-21 17:05 ` [RFC 2/7] igb: use netdev_irqname Stephen Hemminger
2011-06-21 17:05 ` [RFC 3/7] ixgbe: " Stephen Hemminger
2011-06-21 17:05 ` [RFC 4/7] benet: use irq naming standard Stephen Hemminger
2011-06-21 17:05 ` [RFC 5/7] bnx2: use netdev_irqname Stephen Hemminger
2011-06-21 18:11   ` Ben Hutchings
2011-06-21 18:17     ` Stephen Hemminger
2011-06-21 18:42       ` Ben Hutchings
2011-06-21 17:05 ` Stephen Hemminger [this message]
2011-06-21 17:05 ` [RFC 7/7] netxen: " Stephen Hemminger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110621170658.885992666@vyatta.com \
    --to=shemminger@vyatta.com \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).