Panic on today's -current

[Conrad J. Sabatier]

On 24-Jun-2004 Giorgos Keramidas wrote:
> On 2004-06-24 14:22, "Conrad J. Sabatier" <conrads at cox.net> wrote:
>> On 24-Jun-2004 Damian Gerow wrote:
>> > See my thread 'ipf 3.4.35 woes' -- I'm using ipf, but not pf, and
>> > seeing exactly the same thing.  And if I turn off the loading of
>> > ipf
>> > rulesets on boot, the panic goes away.  Reloading them manually
>> > afterwards doesn't cause the panic.
>> 
>> Just upgraded the system and tried this.  It worked without the
>> loading
>> of any ipf/ipnat stuff at boot time.  Manually loading the rules
>> after
>> the system was up was fine, just as you said.
>> 
>> I removed pf from my kernel, btw, since I wasn't using it anyway,
>> but
>> still have ipf (obviously).
> 
> Try applying this minor diff to today's kernel:
> 
> %%
> 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();
> %%
> 

Worked.  Thanks!

-- 
Conrad J. Sabatier <conrads at cox.net> -- "In Unix veritas"