* PATCH: axnet can unload with timers live
@ 2003-07-11 18:05 Alan Cox
2003-07-11 22:40 ` Russell King
0 siblings, 1 reply; 2+ messages in thread
From: Alan Cox @ 2003-07-11 18:05 UTC (permalink / raw)
To: linux-kernel, torvalds
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);
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: PATCH: axnet can unload with timers live
2003-07-11 18:05 PATCH: axnet can unload with timers live Alan Cox
@ 2003-07-11 22:40 ` Russell King
0 siblings, 0 replies; 2+ messages in thread
From: Russell King @ 2003-07-11 22:40 UTC (permalink / raw)
To: Alan Cox; +Cc: linux-kernel, torvalds
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2003-07-11 22:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-07-11 18:05 PATCH: axnet can unload with timers live Alan Cox
2003-07-11 22:40 ` Russell King
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).