diff options
| author | Karsten Keil <kkeil@suse.de> | 2006-05-12 12:49:08 -0700 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2006-05-20 15:00:31 -0700 |
| commit | 39970bdd43f953f204f1bcbdf1d97dc2d78df17f (patch) | |
| tree | 81aa64102bbfdf217091f609ea5903e82cadb868 | |
| parent | 893acf3cd9ad9df7ccb582c009c3759abede330b (diff) | |
| download | lwn-39970bdd43f953f204f1bcbdf1d97dc2d78df17f.tar.gz lwn-39970bdd43f953f204f1bcbdf1d97dc2d78df17f.zip | |
[PATCH] 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>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -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 caf4102b54ce..7d007221cebb 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -7368,21 +7368,23 @@ static int tg3_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) 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; |