Date: Sat, 26 Jun 2004 01:12:44 +0200 From: Max Laier <max@love2party.net> To: freebsd-current@freebsd.org Cc: darrenr@freebsd.org Subject: Re: FIX: today's ipfilter "mutex not locked" panic Message-ID: <200406260112.53490.max@love2party.net> In-Reply-To: <20040624192630.GA739@gothmog.gr> References: <20040624192630.GA739@gothmog.gr>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Thursday 24 June 2004 21:26, Giorgos Keramidas wrote: > FWIW, > > I've locally fixed the panics that some people mentioned today for > ipfilter with the following minor diff. Now I can enable ipfilter > at boot time and still boot without panics. > > --- patch begins --- > Index: sys/contrib/ipfilter/netinet/fil.c > =================================================================== > RCS file: /home/ncvs/src/sys/contrib/ipfilter/netinet/fil.c,v > retrieving revision 1.38 > diff -u -r1.38 fil.c > --- sys/contrib/ipfilter/netinet/fil.c 21 Jun 2004 22:46:35 -0000 1.38 > +++ sys/contrib/ipfilter/netinet/fil.c 24 Jun 2004 19:17:33 -0000 > @@ -2155,9 +2155,6 @@ > ip_natsync(ifp); > ip_statesync(ifp); > } > -# if defined(__FreeBSD_version) && (__FreeBSD_version >= 500043) > - IFNET_RUNLOCK(); > -# endif > ip_natsync((struct ifnet *)-1); > # if defined(__FreeBSD_version) && (__FreeBSD_version >= 500043) > IFNET_RUNLOCK(); > --- patch ends --- The patch is right, looks like merge mess w/ rev. 1.33 to me. Darren (CC'ed) can you commit this? -- Best regards, | mlaier@freebsd.org Max Laier | ICQ #67774661 http://pf4freebsd.love2party.net/ | mlaier@EFnet [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (FreeBSD) iD8DBQBA3LF1XyyEoT62BG0RAvxGAJ9zCW4sn+tXzWoFlgeV6zO86B6GegCfRKMe 5thPz4U5UIpzogtSvCumuZY= =seia -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200406260112.53490.max>