From owner-svn-src-all@FreeBSD.ORG Wed Oct 14 16:21:59 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C06E91065692 for ; Wed, 14 Oct 2009 16:21:59 +0000 (UTC) (envelope-from julian@elischer.org) Received: from outF.internet-mail-service.net (outf.internet-mail-service.net [216.240.47.229]) by mx1.freebsd.org (Postfix) with ESMTP id A7BC08FC1D for ; Wed, 14 Oct 2009 16:21:59 +0000 (UTC) Received: from idiom.com (mx0.idiom.com [216.240.32.160]) by out.internet-mail-service.net (Postfix) with ESMTP id 75790B755B; Wed, 14 Oct 2009 09:22:01 -0700 (PDT) X-Client-Authorized: MaGic Cook1e X-Client-Authorized: MaGic Cook1e X-Client-Authorized: MaGic Cook1e X-Client-Authorized: MaGic Cook1e Received: from julian-mac.elischer.org (home.elischer.org [216.240.48.38]) by idiom.com (Postfix) with ESMTP id 820792D6027; Wed, 14 Oct 2009 09:21:58 -0700 (PDT) Message-ID: <4AD5FAA9.2090202@elischer.org> Date: Wed, 14 Oct 2009 09:22:01 -0700 From: Julian Elischer User-Agent: Thunderbird 2.0.0.23 (Macintosh/20090812) MIME-Version: 1.0 To: "Bjoern A. Zeeb" References: <200910141155.n9EBtuUB035620@svn.freebsd.org> In-Reply-To: <200910141155.n9EBtuUB035620@svn.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r198075 - head/sys/net X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Oct 2009 16:21:59 -0000 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