From owner-svn-src-projects@FreeBSD.ORG Mon Jul 16 08:48:45 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 F3B991065673; Mon, 16 Jul 2012 08:48:44 +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 DE3758FC25; Mon, 16 Jul 2012 08:48:44 +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 q6G8miR2021678; Mon, 16 Jul 2012 08:48:44 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6G8miKT021673; Mon, 16 Jul 2012 08:48:44 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201207160848.q6G8miKT021673@svn.freebsd.org> From: Gleb Smirnoff Date: Mon, 16 Jul 2012 08:48:44 +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: r238523 - 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: Mon, 16 Jul 2012 08:48:45 -0000 Author: glebius Date: Mon Jul 16 08:48:44 2012 New Revision: 238523 URL: http://svn.freebsd.org/changeset/base/238523 Log: Remove useless NPFLOG defines. Modified: projects/pf/head/sys/contrib/pf/net/if_pflog.c projects/pf/head/sys/contrib/pf/net/pf_ioctl.c projects/pf/head/sys/contrib/pf/net/pf_lb.c projects/pf/head/sys/contrib/pf/net/pf_norm.c Modified: projects/pf/head/sys/contrib/pf/net/if_pflog.c ============================================================================== --- projects/pf/head/sys/contrib/pf/net/if_pflog.c Mon Jul 16 08:42:57 2012 (r238522) +++ projects/pf/head/sys/contrib/pf/net/if_pflog.c Mon Jul 16 08:48:44 2012 (r238523) @@ -41,13 +41,6 @@ #include __FBSDID("$FreeBSD$"); -#ifdef DEV_PFLOG -#define NPFLOG DEV_PFLOG -#else -#define NPFLOG 0 -#endif - - #include #include #include Modified: projects/pf/head/sys/contrib/pf/net/pf_ioctl.c ============================================================================== --- projects/pf/head/sys/contrib/pf/net/pf_ioctl.c Mon Jul 16 08:42:57 2012 (r238522) +++ projects/pf/head/sys/contrib/pf/net/pf_ioctl.c Mon Jul 16 08:48:44 2012 (r238523) @@ -43,13 +43,6 @@ __FBSDID("$FreeBSD$"); #include "opt_bpf.h" #include "opt_pf.h" -#ifdef DEV_PFLOG -#define NPFLOG DEV_PFLOG -#else -#define NPFLOG 0 -#endif - - #include #include #include @@ -89,10 +82,7 @@ __FBSDID("$FreeBSD$"); #include #include - -#if NPFLOG > 0 #include -#endif /* NPFLOG > 0 */ #ifdef INET6 #include @@ -1232,12 +1222,10 @@ pfioctl(struct cdev *dev, u_long cmd, ca error = EBUSY; if (rule->rt && !rule->direction) error = EINVAL; -#if NPFLOG > 0 if (!rule->log) rule->logif = 0; if (rule->logif >= PFLOGIFS_MAX) error = EINVAL; -#endif if (pf_addr_setup(ruleset, &rule->src.addr, rule->af)) error = ENOMEM; if (pf_addr_setup(ruleset, &rule->dst.addr, rule->af)) @@ -1485,12 +1473,10 @@ DIOCADDRULE_error: error = EBUSY; if (newrule->rt && !newrule->direction) error = EINVAL; -#if NPFLOG > 0 if (!newrule->log) newrule->logif = 0; if (newrule->logif >= PFLOGIFS_MAX) error = EINVAL; -#endif if (pf_addr_setup(ruleset, &newrule->src.addr, newrule->af)) error = ENOMEM; if (pf_addr_setup(ruleset, &newrule->dst.addr, newrule->af)) Modified: projects/pf/head/sys/contrib/pf/net/pf_lb.c ============================================================================== --- projects/pf/head/sys/contrib/pf/net/pf_lb.c Mon Jul 16 08:42:57 2012 (r238522) +++ projects/pf/head/sys/contrib/pf/net/pf_lb.c Mon Jul 16 08:48:44 2012 (r238523) @@ -43,12 +43,6 @@ __FBSDID("$FreeBSD$"); #include "opt_pf.h" -#ifdef DEV_PFLOG -#define NPFLOG DEV_PFLOG -#else -#define NPFLOG 0 -#endif - #ifdef DEV_PFLOW #define NPFLOW DEV_PFLOW #else Modified: projects/pf/head/sys/contrib/pf/net/pf_norm.c ============================================================================== --- projects/pf/head/sys/contrib/pf/net/pf_norm.c Mon Jul 16 08:42:57 2012 (r238522) +++ projects/pf/head/sys/contrib/pf/net/pf_norm.c Mon Jul 16 08:48:44 2012 (r238523) @@ -32,12 +32,6 @@ #include __FBSDID("$FreeBSD$"); -#ifdef DEV_PFLOG -#define NPFLOG DEV_PFLOG -#else -#define NPFLOG 0 -#endif - #include #include #include