Date: Mon, 16 Jul 2012 08:48:44 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r238523 - projects/pf/head/sys/contrib/pf/net Message-ID: <201207160848.q6G8miKT021673@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#ifdef DEV_PFLOG -#define NPFLOG DEV_PFLOG -#else -#define NPFLOG 0 -#endif - - #include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> 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 <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> @@ -89,10 +82,7 @@ __FBSDID("$FreeBSD$"); #include <net/pfvar.h> #include <net/if_pfsync.h> - -#if NPFLOG > 0 #include <net/if_pflog.h> -#endif /* NPFLOG > 0 */ #ifdef INET6 #include <netinet/ip6.h> @@ -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 <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#ifdef DEV_PFLOG -#define NPFLOG DEV_PFLOG -#else -#define NPFLOG 0 -#endif - #include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207160848.q6G8miKT021673>