From owner-svn-src-projects@FreeBSD.ORG Sat Feb 19 17:13:32 2011 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 D4574106566B; Sat, 19 Feb 2011 17:13:32 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B98538FC0A; Sat, 19 Feb 2011 17:13:32 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1JHDWdg003538; Sat, 19 Feb 2011 17:13:32 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1JHDWBv003536; Sat, 19 Feb 2011 17:13:32 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <201102191713.p1JHDWBv003536@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Sat, 19 Feb 2011 17:13:32 +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: r218859 - projects/pf/pf45/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: Sat, 19 Feb 2011 17:13:32 -0000 Author: bz Date: Sat Feb 19 17:13:32 2011 New Revision: 218859 URL: http://svn.freebsd.org/changeset/base/218859 Log: Add missing include for VNET. Make sysctl compile[1]. Correctly set CURVNET(). Whitespace noise. Submitted by: dim [1] Modified: projects/pf/pf45/sys/contrib/pf/net/if_pfsync.c Modified: projects/pf/pf45/sys/contrib/pf/net/if_pfsync.c ============================================================================== --- projects/pf/pf45/sys/contrib/pf/net/if_pfsync.c Sat Feb 19 17:11:13 2011 (r218858) +++ projects/pf/pf45/sys/contrib/pf/net/if_pfsync.c Sat Feb 19 17:13:32 2011 (r218859) @@ -71,6 +71,7 @@ __FBSDID("$FreeBSD$"); #endif /* __FreeBSD__ */ #include +#include #ifdef __FreeBSD__ #include #include @@ -93,7 +94,6 @@ __FBSDID("$FreeBSD$"); #include #include #endif -#include #include #ifndef __FreeBSD__ #include @@ -107,6 +107,10 @@ __FBSDID("$FreeBSD$"); #include #include #include +#ifdef __FreeBSD__ +#include +#endif + #include #include #include @@ -298,21 +302,24 @@ struct pfsync_softc { }; -#ifndef __FreeBSD__ +#ifdef __FreeBSD__ +static VNET_DEFINE(struct pfsync_softc *, pfsyncif) = NULL; +#define V_pfsyncif VNET(pfsyncif) + +static VNET_DEFINE(struct pfsyncstats, pfsyncstats); +#define V_pfsyncstats VNET(pfsyncstats) + +SYSCTL_NODE(_net, OID_AUTO, pfsync, CTLFLAG_RW, 0, "PFSYNC"); +SYSCTL_VNET_STRUCT(_net_pfsync, OID_AUTO, stats, CTLFLAG_RW, + &VNET_NAME(pfsyncstats), pfsyncstats, + "PFSYNC statistics (struct pfsyncstats, net/if_pfsync.h)"); +#else struct pfsync_softc *pfsyncif = NULL; struct pfsyncstats pfsyncstats; #define V_pfsyncstats pfsyncstats #endif -#ifdef __FreeBSD__ -VNET_DEFINE(struct pfsync_softc *, pfsyncif) = NULL; -#define V_pfsyncif VNET(pfsyncif) -VNET_DEFINE(struct pfsyncstats, pfsyncstats); -#define V_pfsyncstats VNET(pfsyncstats) -SYSCTL_DECL(_net_pfsync); -SYSCTL_VNET_STRUCT(_net_pfsync, 0, stats, CTLFLAG_RW, - &VNET_NAME(pfsyncstats), pfsyncstats, - "PFSYNC statistics (struct pfsyncstats, net/if_pfsync.h)"); +#ifdef __FreeBSD__ static void pfsyncintr(void *); struct pfsync_swi { void * pfsync_swi_cookie; @@ -2509,7 +2516,7 @@ pfsync_defer_tmo(void *arg) s = splsoftnet(); #ifdef __FreeBSD__ - CURVNET_SET(pd->pd_m->m_pkthdr.rcvif); /* XXX */ + CURVNET_SET(pd->pd_m->m_pkthdr.rcvif->if_vnet); /* XXX */ PF_LOCK(); #endif pfsync_undefer(arg, 0); @@ -3270,11 +3277,12 @@ pfsyncintr(void) #endif } -#ifdef notyet int pfsync_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp, size_t newlen) { + +#ifdef notyet /* All sysctl names at this level are terminal. */ if (namelen != 1) return (ENOTDIR); @@ -3285,11 +3293,10 @@ pfsync_sysctl(int *name, u_int namelen, return (EPERM); return (sysctl_struct(oldp, oldlenp, newp, newlen, &V_pfsyncstats, sizeof(V_pfsyncstats))); - default: - return (ENOPROTOOPT); } -} #endif + return (ENOPROTOOPT); +} #ifdef __FreeBSD__ void