From owner-svn-src-projects@FreeBSD.ORG Fri Sep 7 20:57:37 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 46A52106564A; Fri, 7 Sep 2012 20:57:37 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EBB6B8FC0C; Fri, 7 Sep 2012 20:57:36 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q87KvauR061966; Fri, 7 Sep 2012 20:57:36 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q87KvaCd061955; Fri, 7 Sep 2012 20:57:36 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201209072057.q87KvaCd061955@svn.freebsd.org> From: Gleb Smirnoff Date: Fri, 7 Sep 2012 20:57:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240212 - projects/pf/head/sys/contrib/pf/net X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Sep 2012 20:57:37 -0000 Author: glebius Date: Fri Sep 7 20:57:36 2012 New Revision: 240212 URL: http://svn.freebsd.org/changeset/base/240212 Log: Fix VIMAGE build. Modified: projects/pf/head/sys/contrib/pf/net/pf.c projects/pf/head/sys/contrib/pf/net/pf_ioctl.c Modified: projects/pf/head/sys/contrib/pf/net/pf.c ============================================================================== --- projects/pf/head/sys/contrib/pf/net/pf.c Fri Sep 7 19:42:36 2012 (r240211) +++ projects/pf/head/sys/contrib/pf/net/pf.c Fri Sep 7 20:57:36 2012 (r240212) @@ -1238,7 +1238,6 @@ pf_intr(void *v) { struct pf_send_head queue; struct pf_send_entry *pfse, *next; - struct pf_sen CURVNET_SET((struct vnet *)v); @@ -1273,7 +1272,6 @@ pf_intr(void *v) } free(pfse, M_PFTEMP); } - CURVNET_RESTORE(); } Modified: projects/pf/head/sys/contrib/pf/net/pf_ioctl.c ============================================================================== --- projects/pf/head/sys/contrib/pf/net/pf_ioctl.c Fri Sep 7 19:42:36 2012 (r240211) +++ projects/pf/head/sys/contrib/pf/net/pf_ioctl.c Fri Sep 7 20:57:36 2012 (r240212) @@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -59,10 +60,11 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include #include #include +#include #include #include #include