From: "Guo-Fu Tseng" <cooldavid@cooldavid.org>
To: Jeff Garzik <jgarzik@pobox.com>, David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, Ethan <ethanhsiao@jmicron.com>
Subject: [PATCH net-next-2.6 1/4] jme: Modifies messages to display correct hardware version
Date: Sat, 28 Feb 2009 11:54:07 +0800 [thread overview]
Message-ID: <20090228035408.M42101@cooldavid.org> (raw)
In-Reply-To: <20081008215853.M53590@cooldavid.org>
This patch modifies messages to display correct hardware version.
Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org>
diff --git a/drivers/net/jme.c b/drivers/net/jme.c
index 08b3405..60cb997 100644
--- a/drivers/net/jme.c
+++ b/drivers/net/jme.c
@@ -2856,7 +2856,11 @@ jme_init_one(struct pci_dev *pdev,
goto err_out_free_shadow;
}
- msg_probe(jme, "JMC250 gigabit%s ver:%x rev:%x macaddr:%pM\n",
+ msg_probe(jme, "%s%s ver:%x rev:%x macaddr:%pM\n",
+ (jme->pdev->device == PCI_DEVICE_ID_JMICRON_JMC250) ?
+ "JMC250 Gigabit Ethernet" :
+ (jme->pdev->device == PCI_DEVICE_ID_JMICRON_JMC260) ?
+ "JMC260 Fast Ethernet" : "Unknown",
(jme->fpgaver != 0) ? " (FPGA)" : "",
(jme->fpgaver != 0) ? jme->fpgaver : jme->chiprev,
jme->rev, netdev->dev_addr);
@@ -3002,7 +3006,7 @@ static struct pci_driver jme_driver = {
static int __init
jme_init_module(void)
{
- printk(KERN_INFO PFX "JMicron JMC250 gigabit ethernet "
+ printk(KERN_INFO PFX "JMicron JMC2XX ethernet "
"driver version %s\n", DRV_VERSION);
return pci_register_driver(&jme_driver);
}
next prev parent reply other threads:[~2009-02-28 3:55 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-15 17:00 [PATCH netdev-2.6] jme: JMicron Gigabit Ethernet Driver Guo-Fu Tseng
2008-09-16 2:47 ` Ethan
2008-09-18 16:07 ` Jeff Garzik
2008-10-08 21:56 ` [PATCH net-next-2.6 1/3] jme: Added half-duplex mode and IPv6 RSS fix Guo-Fu Tseng
2008-10-09 2:51 ` David Miller
2008-10-08 21:57 ` [PATCH net-next-2.6 2/3] jme: Faulty IRQ handle bug fix Guo-Fu Tseng
2008-10-09 2:51 ` David Miller
2008-10-08 21:58 ` [PATCH net-next-2.6 3/3] jme: Advances version number Guo-Fu Tseng
2008-10-09 2:51 ` David Miller
2008-12-03 10:41 ` [PATCH net-2.6 1/2] jme: GHC register control fix for new hardware Guo-Fu Tseng
2008-12-03 15:00 ` Jeff Garzik
2008-12-04 5:20 ` David Miller
2008-12-03 10:44 ` [PATCH net-2.6 2/2] jme: Remove 64 and 40 bit dma_mask Guo-Fu Tseng
2009-02-28 3:54 ` Guo-Fu Tseng [this message]
2009-02-28 3:57 ` [PATCH net-next-2.6 2/4] jme: Fix pci sync Guo-Fu Tseng
2009-02-28 3:58 ` [PATCH net-next-2.6 3/4] jme: Clear all modified GHC register flags Guo-Fu Tseng
2009-02-28 3:59 ` [PATCH net-next-2.6 4/4] jme: Adding {64,40}bits DMA mask back Guo-Fu Tseng
2009-03-02 8:39 ` [PATCH net-next] jme: Advance version number after previous changes Guo-Fu Tseng
2009-03-02 9:55 ` David Miller
2008-11-21 5:20 ` [PATCH netdev-2.6] jme: JMicron Gigabit Ethernet Driver Stephen Hemminger
2008-11-21 5:36 ` David Miller
2008-11-21 6:45 ` Stephen Hemminger
2008-11-21 8:46 ` David Miller
2008-11-21 16:22 ` Guo-Fu Tseng
2008-11-21 16:18 ` Guo-Fu Tseng
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=20090228035408.M42101@cooldavid.org \
--to=cooldavid@cooldavid.org \
--cc=davem@davemloft.net \
--cc=ethanhsiao@jmicron.com \
--cc=jgarzik@pobox.com \
--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).