Commit 507226e4 authored by Jeff Garzik's avatar Jeff Garzik

Merge redhat.com:/spare/repo/netdev-2.6/tulip

into redhat.com:/spare/repo/net-drivers-2.6
parents 3b55888b f85c9074
This diff is collapsed.
...@@ -159,10 +159,16 @@ void comet_timer(unsigned long data) ...@@ -159,10 +159,16 @@ void comet_timer(unsigned long data)
if (tulip_debug > 1) if (tulip_debug > 1)
printk(KERN_DEBUG "%s: Comet link status %4.4x partner capability " printk(KERN_DEBUG "%s: Comet link status %4.4x partner capability "
"%4.4x.\n", "%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 /* mod_timer synchronizes us with potential add_timer calls
* from interrupts. * 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)); mod_timer(&tp->timer, RUN_AT(next_tick));
} }
...@@ -178,7 +178,7 @@ struct tulip_chip_table tulip_tbl[] = { ...@@ -178,7 +178,7 @@ struct tulip_chip_table tulip_tbl[] = {
/* COMET */ /* COMET */
{ "ADMtek Comet", 256, 0x0001abef, { "ADMtek Comet", 256, 0x0001abef,
MC_HASH_ONLY | COMET_MAC_ADDR, comet_timer }, HAS_MII | MC_HASH_ONLY | COMET_MAC_ADDR, comet_timer },
/* COMPEX9881 */ /* COMPEX9881 */
{ "Compex 9881 PMAC", 128, 0x0001ebef, { "Compex 9881 PMAC", 128, 0x0001ebef,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment