From: Stephen Hemminger <shemminger@vyatta.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org
Subject: [RFC 2/7] igb: use netdev_irqname
Date: Tue, 21 Jun 2011 10:05:43 -0700 [thread overview]
Message-ID: <20110621170658.485641406@vyatta.com> (raw)
In-Reply-To: 20110621170541.309890798@vyatta.com
[-- Attachment #1: igb-use-irq-name.patch --]
[-- Type: text/plain, Size: 1563 bytes --]
This is an example of usage of netdev_irqname to create standard
IRQ names. There is a change of behavior, the driver will now skip
unused IRQ vectors (similar to ixgbe).
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
--- a/drivers/net/igb/igb_main.c 2011-06-21 09:12:49.567952849 -0700
+++ b/drivers/net/igb/igb_main.c 2011-06-21 09:29:48.211952277 -0700
@@ -920,16 +920,20 @@ static int igb_request_msix(struct igb_a
q_vector->itr_register = hw->hw_addr + E1000_EITR(vector);
if (q_vector->rx_ring && q_vector->tx_ring)
- sprintf(q_vector->name, "%s-TxRx-%u", netdev->name,
- q_vector->rx_ring->queue_index);
+ netdev_irqname(q_vector->name, sizeof(q_vector->name),
+ netdev, NETIF_IRQ_TXRX,
+ q_vector->rx_ring->queue_index);
else if (q_vector->tx_ring)
- sprintf(q_vector->name, "%s-tx-%u", netdev->name,
- q_vector->tx_ring->queue_index);
+ netdev_irqname(q_vector->name, sizeof(q_vector->name),
+ netdev, NETIF_IRQ_TX,
+ q_vector->tx_ring->queue_index);
else if (q_vector->rx_ring)
- sprintf(q_vector->name, "%s-rx-%u", netdev->name,
- q_vector->rx_ring->queue_index);
- else
- sprintf(q_vector->name, "%s-unused", netdev->name);
+ netdev_irqname(q_vector->name, sizeof(q_vector->name),
+ netdev, NETIF_IRQ_RX,
+ q_vector->rx_ring->queue_index);
+ else /* skip this unused q_vector */
+ continue;
+
err = request_irq(adapter->msix_entries[vector].vector,
igb_msix_ring, 0, q_vector->name,
next prev 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 ` Stephen Hemminger [this message]
2011-06-21 17:05 ` [RFC 3/7] ixgbe: use netdev_irqname 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 ` [RFC 6/7] niu: " Stephen Hemminger
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.485641406@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).