* [PATCH 1/6 2.5] e100 - restore speed/duplex/autoneg settings after diagnostic test
@ 2004-07-29 15:26 ganesh.venkatesan
2004-07-29 16:17 ` Jeff Garzik
0 siblings, 1 reply; 2+ messages in thread
From: ganesh.venkatesan @ 2004-07-29 15:26 UTC (permalink / raw)
To: jgarzik; +Cc: netdev, ganesh.venkatesan
--- linux-2.5/drivers/net/e100.c 2004-07-29 00:23:31.781375960 -0700
+++ linux-2.5/drivers/net/e100.c.mod 2004-07-29 00:24:52.375123848 -0700
@@ -1961,18 +1961,27 @@ static int e100_diag_test_count(struct n
static void e100_diag_test(struct net_device *netdev,
struct ethtool_test *test, u64 *data)
{
+ struct ethtool_cmd cmd;
struct nic *nic = netdev_priv(netdev);
- int i;
+ int i, err;
memset(data, 0, E100_TEST_LEN * sizeof(u64));
data[0] = !mii_link_ok(&nic->mii);
data[1] = e100_eeprom_load(nic);
if(test->flags & ETH_TEST_FL_OFFLINE) {
+
+ /* save speed, duplex & autoneg settings */
+ err = mii_ethtool_gset(&nic->mii, &cmd);
+
if(netif_running(netdev))
e100_down(nic);
data[2] = e100_self_test(nic);
data[3] = e100_loopback_test(nic, lb_mac);
data[4] = e100_loopback_test(nic, lb_phy);
+
+ /* restore speed, duplex & autoneg settings */
+ err = mii_ethtool_sset(&nic->mii, &cmd);
+
if(netif_running(netdev))
e100_up(nic);
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH 1/6 2.5] e100 - restore speed/duplex/autoneg settings after diagnostic test
2004-07-29 15:26 [PATCH 1/6 2.5] e100 - restore speed/duplex/autoneg settings after diagnostic test ganesh.venkatesan
@ 2004-07-29 16:17 ` Jeff Garzik
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2004-07-29 16:17 UTC (permalink / raw)
To: ganesh.venkatesan; +Cc: netdev
applied all 6 patches to 2.6.x
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2004-07-29 16:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-07-29 15:26 [PATCH 1/6 2.5] e100 - restore speed/duplex/autoneg settings after diagnostic test ganesh.venkatesan
2004-07-29 16:17 ` Jeff Garzik
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).