From: Russell King <rmk@arm.linux.org.uk>
To: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: linux-kernel@vger.kernel.org, torvalds@transmeta.com
Subject: Re: PATCH: axnet can unload with timers live
Date: Fri, 11 Jul 2003 23:40:33 +0100 [thread overview]
Message-ID: <20030711234033.H23713@flint.arm.linux.org.uk> (raw)
In-Reply-To: <200307111805.h6BI5kxD017236@hraefn.swansea.linux.org.uk>; from alan@lxorguk.ukuu.org.uk on Fri, Jul 11, 2003 at 07:05:46PM +0100
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
prev parent reply other threads:[~2003-07-11 22:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-07-11 18:05 PATCH: axnet can unload with timers live Alan Cox
2003-07-11 22:40 ` Russell King [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20030711234033.H23713@flint.arm.linux.org.uk \
--to=rmk@arm.linux.org.uk \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@transmeta.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox