Messages in this thread | | | Date | Fri, 11 Jul 2003 23:40:33 +0100 | From | Russell King <> | Subject | Re: PATCH: axnet can unload with timers live |
| |
On Fri, Jul 11, 2003 at 07:05:46PM +0100, Alan Cox wrote: > diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.75/drivers/net/pcmcia/axnet_cs.c linux-2.5.75-ac1/drivers/net/pcmcia/axnet_cs.c > --- linux-2.5.75/drivers/net/pcmcia/axnet_cs.c 2003-07-10 21:10:53.000000000 +0100 > +++ linux-2.5.75-ac1/drivers/net/pcmcia/axnet_cs.c 2003-07-11 15:21:39.000000000 +0100 > @@ -258,7 +258,7 @@ > if (*linkp == NULL) > return; > > - del_timer(&link->release); > + del_timer_sync(&link->release); > if (link->state & DEV_CONFIG) { > axnet_release((u_long)link); > if (link->state & DEV_STALE_CONFIG) { > @@ -706,7 +706,7 @@ > > link->open--; > netif_stop_queue(dev); > - del_timer(&info->watchdog); > + del_timer_sync(&info->watchdog); > if (link->state & DEV_STALE_CONFIG) > mod_timer(&link->release, jiffies + HZ/20);
The pcmcia release timers actually want killing off.
-- Russell King (rmk@arm.linux.org.uk) The developer of ARM Linux http://www.arm.linux.org.uk/personal/aboutme.html
- 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/
| |