cvs commit: src/sys/pci if_sk.c if_skreg.h
gurney_j at resnet.uoregon.edu
Mon Nov 15 14:22:19 PST 2004
Bjoern A. Zeeb wrote this message on Mon, Nov 15, 2004 at 21:37 +0000:
> 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
> I had reports of people running into the panic in sk_jfree
> with the patch from this link.
Yes, the one that I posted in that message was to make sure that we
didn't have the lock (and prevent adding another recursion point)..
I finally got around to testing that patch myself, and it was truely
> > @@ -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 ?
John-Mark Gurney Voice: +1 415 225 5579
"All that I will do, has been done, All that I have, has not."
More information about the cvs-all