PERFORCE change 118399 for review

[Max Laier]

On Thursday 19 April 2007 09:39, Marko Zec wrote:
> http://perforce.freebsd.org/chv.cgi?CH=118399
>
> Change 118399 by zec at zec_tca51 on 2007/04/19 07:38:43
>
> 	Fix to allow compilation with nooptions VIMAGE.
>
> Affected files ...
>
> .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#5 edit
>
> Differences ...
>
> ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#5
> (text+ko) ====
>
> @@ -401,10 +401,14 @@
>  	callout_reset(&V_pf_expire_to, my_timeout[PFTM_INTERVAL] * hz,
>  	    pf_purge_timeout, curvnet);
>
> -if (curvnet == &vnet_0) {
> +#ifdef VIMAGE
> +	if (curvnet == &vnet_0) {
> +#endif
>  	pf_normalize_init();
>  	pf_pfil_hooked = 0;
> -}
> +#ifdef VIMAGE
> +	}
> +#endif

I don't quite understand this one.  I'd believe that pf_pfil_hooked should 
be virtualized as well.  Otherwise you can only enable/hook all instances 
at once.

>  	bzero(&V_pf_status, sizeof(V_pf_status));
>  	/* XXX do our best to avoid a conflict */

-- 
/"\  Best regards,                      | mlaier at freebsd.org
\ /  Max Laier                          | ICQ #67774661
 X   http://pf4freebsd.love2party.net/  | mlaier at EFnet
/ \  ASCII Ribbon Campaign              | Against HTML Mail and News
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/p4-projects/attachments/20070419/34c34e7f/attachment.pgp