Date: Wed, 14 Oct 2009 09:22:01 -0700 From: Julian Elischer <julian@elischer.org> To: "Bjoern A. Zeeb" <bz@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r198075 - head/sys/net Message-ID: <4AD5FAA9.2090202@elischer.org> In-Reply-To: <200910141155.n9EBtuUB035620@svn.freebsd.org> References: <200910141155.n9EBtuUB035620@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Bjoern A. Zeeb wrote: > Author: bz > Date: Wed Oct 14 11:55:55 2009 > New Revision: 198075 > URL: http://svn.freebsd.org/changeset/base/198075 > > Log: > Unbreak the VIMAGE build with IPSEC, broken with r197952 by > virtualizing the pfil hooks. > For consistency add the V_ to virtualize the pfil hooks in here as well. > > MFC after: 55 days > X-MFC after: julian MFCed r197952. did these get added recently or something? > > Modified: > head/sys/net/if_enc.c > > Modified: head/sys/net/if_enc.c > ============================================================================== > --- head/sys/net/if_enc.c Wed Oct 14 11:50:22 2009 (r198074) > +++ head/sys/net/if_enc.c Wed Oct 14 11:55:55 2009 (r198075) > @@ -243,9 +243,9 @@ ipsec_filter(struct mbuf **mp, int dir, > } > > /* Skip pfil(9) if no filters are loaded */ > - if (!(PFIL_HOOKED(&inet_pfil_hook) > + if (!(PFIL_HOOKED(&V_inet_pfil_hook) > #ifdef INET6 > - || PFIL_HOOKED(&inet6_pfil_hook) > + || PFIL_HOOKED(&V_inet6_pfil_hook) > #endif > )) { > return (0); > @@ -271,7 +271,7 @@ ipsec_filter(struct mbuf **mp, int dir, > ip->ip_len = ntohs(ip->ip_len); > ip->ip_off = ntohs(ip->ip_off); > > - error = pfil_run_hooks(&inet_pfil_hook, mp, > + error = pfil_run_hooks(&V_inet_pfil_hook, mp, > encif, dir, NULL); > > if (*mp == NULL || error != 0) > @@ -285,7 +285,7 @@ ipsec_filter(struct mbuf **mp, int dir, > > #ifdef INET6 > case 6: > - error = pfil_run_hooks(&inet6_pfil_hook, mp, > + error = pfil_run_hooks(&V_inet6_pfil_hook, mp, > encif, dir, NULL); > break; > #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4AD5FAA9.2090202>