Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751260AbWEQWP7 (ORCPT ); Wed, 17 May 2006 18:15:59 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751261AbWEQWMk (ORCPT ); Wed, 17 May 2006 18:12:40 -0400 Received: from 216-99-217-87.dsl.aracnet.com ([216.99.217.87]:56451 "EHLO sous-sol.org") by vger.kernel.org with ESMTP id S1751259AbWEQWM0 (ORCPT ); Wed, 17 May 2006 18:12:26 -0400 Message-Id: <20060517221403.630773000@sous-sol.org> References: <20060517221312.227391000@sous-sol.org> Date: Wed, 17 May 2006 00:00:10 -0700 From: Chris Wright To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk, Karsten Keil , Michael Chan , "David S. Miller" , Greg Kroah-Hartman Subject: [PATCH 10/22] [PATCH] TG3: ethtool always report port is TP. Content-Disposition: inline; filename=tg3-ethtool-always-report-port-is-tp.patch Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1666 Lines: 52 -stable review patch. If anyone has any objections, please let us know. ------------------ Even with fiber cards ethtool reports that the connected port is TP, the patch fix this. Signed-off-by: Karsten Keil Acked-by: Michael Chan Signed-off-by: "David S. Miller" Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman --- 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; -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/