* [PATCH] ethtool always report port is TP on tg3
@ 2006-05-12 10:05 Karsten Keil
2006-05-12 14:59 ` Michael Chan
0 siblings, 1 reply; 4+ messages in thread
From: Karsten Keil @ 2006-05-12 10:05 UTC (permalink / raw)
To: Michael Chan; +Cc: netdev, Andrew Morton
Even with fiber cards ethtool reports that the connected port is TP,
the patch fix this.
---
drivers/net/tg3.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
5ed8e79c778ee803e44a325a1e15c0cb3f52d0ff
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index beeb612..0b5bc93 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -7653,21 +7653,23 @@ static int tg3_get_settings(struct net_d
cmd->supported |= (SUPPORTED_1000baseT_Half |
SUPPORTED_1000baseT_Full);
- if (!(tp->tg3_flags2 & TG3_FLG2_ANY_SERDES))
+ if (!(tp->tg3_flags2 & TG3_FLG2_ANY_SERDES)) {
cmd->supported |= (SUPPORTED_100baseT_Half |
SUPPORTED_100baseT_Full |
SUPPORTED_10baseT_Half |
SUPPORTED_10baseT_Full |
SUPPORTED_MII);
- else
+ cmd->port = PORT_TP;
+ } else {
cmd->supported |= SUPPORTED_FIBRE;
+ cmd->port = PORT_FIBRE;
+ }
cmd->advertising = tp->link_config.advertising;
if (netif_running(dev)) {
cmd->speed = tp->link_config.active_speed;
cmd->duplex = tp->link_config.active_duplex;
}
- cmd->port = 0;
cmd->phy_address = PHY_ADDR;
cmd->transceiver = 0;
cmd->autoneg = tp->link_config.autoneg;
--
Karsten Keil
SuSE Labs
ISDN development
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] ethtool always report port is TP on tg3
2006-05-12 10:05 [PATCH] ethtool always report port is TP on tg3 Karsten Keil
@ 2006-05-12 14:59 ` Michael Chan
2006-05-12 17:46 ` Karsten Keil
0 siblings, 1 reply; 4+ messages in thread
From: Michael Chan @ 2006-05-12 14:59 UTC (permalink / raw)
To: Karsten Keil; +Cc: netdev, Andrew Morton
On Fri, 2006-05-12 at 12:05 +0200, Karsten Keil wrote:
> Even with fiber cards ethtool reports that the connected port is TP,
> the patch fix this.
ACK. Thanks. Please add sign-off line and send to DaveM.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ethtool always report port is TP on tg3
2006-05-12 14:59 ` Michael Chan
@ 2006-05-12 17:46 ` Karsten Keil
2006-05-12 19:49 ` David S. Miller
0 siblings, 1 reply; 4+ messages in thread
From: Karsten Keil @ 2006-05-12 17:46 UTC (permalink / raw)
To: David S. Miller; +Cc: Michael Chan, netdev, Andrew Morton
On Fri, May 12, 2006 at 07:59:54AM -0700, Michael Chan wrote:
>
> ACK. Thanks. Please add sign-off line and send to DaveM.
This time with Signed-off line.
Even with fiber cards ethtool reports that the connected port is TP,
the patch fix this.
Signed-off-by: Karsten Keil <kkeil@suse.de>
---
drivers/net/tg3.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
5ed8e79c778ee803e44a325a1e15c0cb3f52d0ff
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index beeb612..0b5bc93 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -7653,21 +7653,23 @@ static int tg3_get_settings(struct net_d
cmd->supported |= (SUPPORTED_1000baseT_Half |
SUPPORTED_1000baseT_Full);
- if (!(tp->tg3_flags2 & TG3_FLG2_ANY_SERDES))
+ if (!(tp->tg3_flags2 & TG3_FLG2_ANY_SERDES)) {
cmd->supported |= (SUPPORTED_100baseT_Half |
SUPPORTED_100baseT_Full |
SUPPORTED_10baseT_Half |
SUPPORTED_10baseT_Full |
SUPPORTED_MII);
- else
+ cmd->port = PORT_TP;
+ } else {
cmd->supported |= SUPPORTED_FIBRE;
+ cmd->port = PORT_FIBRE;
+ }
cmd->advertising = tp->link_config.advertising;
if (netif_running(dev)) {
cmd->speed = tp->link_config.active_speed;
cmd->duplex = tp->link_config.active_duplex;
}
- cmd->port = 0;
cmd->phy_address = PHY_ADDR;
cmd->transceiver = 0;
cmd->autoneg = tp->link_config.autoneg;
--
Karsten Keil
SuSE Labs
ISDN development
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2006-05-12 19:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-05-12 10:05 [PATCH] ethtool always report port is TP on tg3 Karsten Keil
2006-05-12 14:59 ` Michael Chan
2006-05-12 17:46 ` Karsten Keil
2006-05-12 19:49 ` David S. Miller
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).