patch-2.4.27 linux-2.4.27/drivers/net/tulip/timer.c

• Lines: 18
• Date: 2004-08-07 16:26:05.155367364 -0700
• Orig file: linux-2.4.26/drivers/net/tulip/timer.c
• Orig date: 2003-06-13 07:51:35.000000000 -0700

diff -urN linux-2.4.26/drivers/net/tulip/timer.c linux-2.4.27/drivers/net/tulip/timer.c
@@ -211,10 +211,16 @@
 	if (tulip_debug > 1)
 		printk(KERN_DEBUG "%s: Comet link status %4.4x partner capability "
 			   "%4.4x.\n",
-			   dev->name, inl(ioaddr + 0xB8), inl(ioaddr + 0xC8));
+			   dev->name,
+			   tulip_mdio_read(dev, tp->phys[0], 1),
+			   tulip_mdio_read(dev, tp->phys[0], 5));
 	/* mod_timer synchronizes us with potential add_timer calls
 	 * from interrupts.
 	 */
+	if (tulip_check_duplex(dev) < 0)
+		{ netif_carrier_off(dev); }
+	else
+		{ netif_carrier_on(dev); }
 	mod_timer(&tp->timer, RUN_AT(next_tick));
 }