diff options
author | Karsten Keil <kkeil@suse.de> | 2006-05-12 15:49:08 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-05-12 15:49:08 -0400 |
commit | ef34814426862c41c061520d4ac833be5914b5ba (patch) | |
tree | b844afa6b8c0f9ef5062c5a37462b1f47b858baf | |
parent | d649dafd0713f2f3dfe29baa783868db33aa2c11 (diff) |
[TG3]: ethtool always report port is TP.
Even with fiber cards ethtool reports that the connected port is TP,
the patch fix this.
Signed-off-by: Karsten Keil <kkeil@suse.de>
Acked-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/tg3.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 2bd9592b75cd..e1b33a25a25f 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -7653,21 +7653,23 @@ static int tg3_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) | |||
7653 | cmd->supported |= (SUPPORTED_1000baseT_Half | | 7653 | cmd->supported |= (SUPPORTED_1000baseT_Half | |
7654 | SUPPORTED_1000baseT_Full); | 7654 | SUPPORTED_1000baseT_Full); |
7655 | 7655 | ||
7656 | if (!(tp->tg3_flags2 & TG3_FLG2_ANY_SERDES)) | 7656 | if (!(tp->tg3_flags2 & TG3_FLG2_ANY_SERDES)) { |
7657 | cmd->supported |= (SUPPORTED_100baseT_Half | | 7657 | cmd->supported |= (SUPPORTED_100baseT_Half | |
7658 | SUPPORTED_100baseT_Full | | 7658 | SUPPORTED_100baseT_Full | |
7659 | SUPPORTED_10baseT_Half | | 7659 | SUPPORTED_10baseT_Half | |
7660 | SUPPORTED_10baseT_Full | | 7660 | SUPPORTED_10baseT_Full | |
7661 | SUPPORTED_MII); | 7661 | SUPPORTED_MII); |
7662 | else | 7662 | cmd->port = PORT_TP; |
7663 | } else { | ||
7663 | cmd->supported |= SUPPORTED_FIBRE; | 7664 | cmd->supported |= SUPPORTED_FIBRE; |
7665 | cmd->port = PORT_FIBRE; | ||
7666 | } | ||
7664 | 7667 | ||
7665 | cmd->advertising = tp->link_config.advertising; | 7668 | cmd->advertising = tp->link_config.advertising; |
7666 | if (netif_running(dev)) { | 7669 | if (netif_running(dev)) { |
7667 | cmd->speed = tp->link_config.active_speed; | 7670 | cmd->speed = tp->link_config.active_speed; |
7668 | cmd->duplex = tp->link_config.active_duplex; | 7671 | cmd->duplex = tp->link_config.active_duplex; |
7669 | } | 7672 | } |
7670 | cmd->port = 0; | ||
7671 | cmd->phy_address = PHY_ADDR; | 7673 | cmd->phy_address = PHY_ADDR; |
7672 | cmd->transceiver = 0; | 7674 | cmd->transceiver = 0; |
7673 | cmd->autoneg = tp->link_config.autoneg; | 7675 | cmd->autoneg = tp->link_config.autoneg; |