| From nobody Mon Sep 17 00:00:00 2001 |
| From: Karsten Keil <kkeil@suse.de> |
| Date: Fri May 12 12:49:08 2006 -0700 |
| Subject: 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> |
| --- |
| |
| drivers/net/tg3.c | 8 +++++--- |
| 1 file changed, 5 insertions(+), 3 deletions(-) |
| |
| --- linux-2.6.16.16.orig/drivers/net/tg3.c |
| +++ linux-2.6.16.16/drivers/net/tg3.c |
| @@ -7368,21 +7368,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; |