cvs commit: src/sys/pci if_sk.c if_skreg.h
Bjoern A. Zeeb
bzeeb-lists at lists.zabbadoz.net
Mon Nov 15 21:40:09 GMT 2004
On Mon, 15 Nov 2004, John-Mark Gurney wrote:
> jmg 2004-11-15 19:37:21 UTC
>
> FreeBSD src repository
>
> Modified files:
> sys/pci if_sk.c if_skreg.h
> Log:
> fix the missing lock in sk_jfree (verified w/ an assert)
> also fix up handling and proding of the tx, _OACTIVE is now handled
> better...
>
> Submitted by: Peter Edwards (sk_jfree)
> Obtained from: OpenBSD and/or NetBSD (tx prod)
This seems to be different from the version in
http://lists.freebsd.org/pipermail/freebsd-current/2004-November/042195.html
I had reports of people running into the panic in sk_jfree
with the patch from this link.
Thanks.
*hmm*
> @@ -1104,6 +1106,7 @@ sk_jfree(buf, args)
>
> /* Extract the softc struct pointer. */
> sc_if = (struct sk_if_softc *)args;
> + SK_IF_LOCK(sc_if);
>
> if (sc_if == NULL)
> panic("sk_jfree: didn't get softc pointer!");
mind moving the SK_IF_LOCK down behind the NULL/panic check ?
--
Bjoern A. Zeeb bzeeb at Zabbadoz dot NeT
More information about the cvs-src
mailing list