* [PATCH 7/7][TG3]: Identify Serdes devices more clearly.
@ 2006-12-07 7:47 Michael Chan
2006-12-07 8:24 ` David Miller
2006-12-07 8:42 ` Jeff Garzik
0 siblings, 2 replies; 3+ messages in thread
From: Michael Chan @ 2006-12-07 7:47 UTC (permalink / raw)
To: davem, netdev
[TG3]: Identify Serdes devices more clearly.
Change the message to more clearly identify Serdes devices.
Update version to 3.70.
Signed-off-by: Michael Chan <mchan@broadcom.com>
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 61e9533..a71707e 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -68,8 +68,8 @@
#define DRV_MODULE_NAME "tg3"
#define PFX DRV_MODULE_NAME ": "
-#define DRV_MODULE_VERSION "3.69"
-#define DRV_MODULE_RELDATE "November 15, 2006"
+#define DRV_MODULE_VERSION "3.70"
+#define DRV_MODULE_RELDATE "December 1, 2006"
#define TG3_DEF_MAC_MODE 0
#define TG3_DEF_RX_MODE 0
@@ -11932,13 +11932,15 @@ static int __devinit tg3_init_one(struct
pci_set_drvdata(pdev, dev);
- printk(KERN_INFO "%s: Tigon3 [partno(%s) rev %04x PHY(%s)] (%s) %sBaseT Ethernet ",
+ printk(KERN_INFO "%s: Tigon3 [partno(%s) rev %04x PHY(%s)] (%s) %s Ethernet ",
dev->name,
tp->board_part_number,
tp->pci_chip_rev_id,
tg3_phy_string(tp),
tg3_bus_string(tp, str),
- (tp->tg3_flags & TG3_FLAG_10_100_ONLY) ? "10/100" : "10/100/1000");
+ ((tp->tg3_flags & TG3_FLAG_10_100_ONLY) ? "10/100Base-TX" :
+ ((tp->tg3_flags2 & TG3_FLG2_ANY_SERDES) ? "1000Base-SX" :
+ "10/100/1000Base-T")));
for (i = 0; i < 6; i++)
printk("%2.2x%c", dev->dev_addr[i],
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 7/7][TG3]: Identify Serdes devices more clearly.
2006-12-07 7:47 [PATCH 7/7][TG3]: Identify Serdes devices more clearly Michael Chan
@ 2006-12-07 8:24 ` David Miller
2006-12-07 8:42 ` Jeff Garzik
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2006-12-07 8:24 UTC (permalink / raw)
To: mchan; +Cc: netdev
From: "Michael Chan" <mchan@broadcom.com>
Date: Wed, 06 Dec 2006 23:47:23 -0800
> [TG3]: Identify Serdes devices more clearly.
>
> Change the message to more clearly identify Serdes devices.
>
> Update version to 3.70.
>
> Signed-off-by: Michael Chan <mchan@broadcom.com>
Applied.
Thanks Michael.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 7/7][TG3]: Identify Serdes devices more clearly.
2006-12-07 7:47 [PATCH 7/7][TG3]: Identify Serdes devices more clearly Michael Chan
2006-12-07 8:24 ` David Miller
@ 2006-12-07 8:42 ` Jeff Garzik
1 sibling, 0 replies; 3+ messages in thread
From: Jeff Garzik @ 2006-12-07 8:42 UTC (permalink / raw)
To: Michael Chan; +Cc: davem, netdev
Michael Chan wrote:
> [TG3]: Identify Serdes devices more clearly.
>
> Change the message to more clearly identify Serdes devices.
>
> Update version to 3.70.
ACK patches 1-7
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-12-07 8:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-12-07 7:47 [PATCH 7/7][TG3]: Identify Serdes devices more clearly Michael Chan
2006-12-07 8:24 ` David Miller
2006-12-07 8:42 ` Jeff Garzik
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).