From: Stephen Hemminger <shemminger@vyatta.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org
Subject: [RFC 5/7] bnx2: use netdev_irqname
Date: Tue, 21 Jun 2011 10:05:46 -0700 [thread overview]
Message-ID: <20110621170658.788401517@vyatta.com> (raw)
In-Reply-To: 20110621170541.309890798@vyatta.com
[-- Attachment #1: bnx2-use-irqname.patch --]
[-- Type: text/plain, Size: 1006 bytes --]
Also increase size of irq name to account for longer device names.
Original code was broken for full size names.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
--- a/drivers/net/bnx2.c 2011-06-21 09:52:00.527951530 -0700
+++ b/drivers/net/bnx2.c 2011-06-21 09:52:58.807951497 -0700
@@ -6173,7 +6173,8 @@ bnx2_enable_msix(struct bnx2 *bp, int ms
bp->flags |= BNX2_FLAG_USING_MSIX | BNX2_FLAG_ONE_SHOT_MSI;
for (i = 0; i < total_vecs; i++) {
bp->irq_tbl[i].vector = msix_ent[i].vector;
- snprintf(bp->irq_tbl[i].name, len, "%s-%d", dev->name, i);
+ netdev_irqname(bp->irq_tbl[i].name, len,
+ dev, NETIF_IRQ_TXRX, i);
bp->irq_tbl[i].handler = bnx2_msi_1shot;
}
}
--- a/drivers/net/bnx2.h 2011-06-21 09:53:18.331951487 -0700
+++ b/drivers/net/bnx2.h 2011-06-21 09:53:51.723951469 -0700
@@ -6657,7 +6657,7 @@ struct bnx2_irq {
irq_handler_t handler;
unsigned int vector;
u8 requested;
- char name[IFNAMSIZ + 2];
+ char name[32];
};
struct bnx2_tx_ring_info {
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 ` [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 ` Stephen Hemminger [this message]
2011-06-21 18:11 ` [RFC 5/7] bnx2: use netdev_irqname 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.788401517@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).