Date: Sat, 10 Oct 2009 20:26:18 +0000 (UTC) From: Ermal Luçi <eri@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r197940 - in user/eri/pf45/head/sys: contrib/pf/net modules/pf Message-ID: <200910102026.n9AKQIIM091527@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: eri Date: Sat Oct 10 20:26:17 2009 New Revision: 197940 URL: http://svn.freebsd.org/changeset/base/197940 Log: Remove notyet defines for pflow(4). Modified: user/eri/pf45/head/sys/contrib/pf/net/pf.c user/eri/pf45/head/sys/contrib/pf/net/pf_lb.c user/eri/pf45/head/sys/modules/pf/Makefile Modified: user/eri/pf45/head/sys/contrib/pf/net/pf.c ============================================================================== --- user/eri/pf45/head/sys/contrib/pf/net/pf.c Sat Oct 10 19:54:45 2009 (r197939) +++ user/eri/pf45/head/sys/contrib/pf/net/pf.c Sat Oct 10 20:26:17 2009 (r197940) @@ -65,8 +65,12 @@ __FBSDID("$FreeBSD$"); #define NPFSYNC 0 #endif - /* XXX */ - #define NPFLOW 0 + #ifdef DEV_PFLOW + #define NPFLOW DEV_PFLOW + #else + #define NPFLOW 0 + #endif + #else #include "bpfilter.h" #include "pflog.h" @@ -140,9 +144,7 @@ __FBSDID("$FreeBSD$"); #endif #include <net/pfvar.h> #include <net/if_pflog.h> -#ifdef notyet #include <net/if_pflow.h> -#endif #if NPFSYNC > 0 #include <net/if_pfsync.h> Modified: user/eri/pf45/head/sys/contrib/pf/net/pf_lb.c ============================================================================== --- user/eri/pf45/head/sys/contrib/pf/net/pf_lb.c Sat Oct 10 19:54:45 2009 (r197939) +++ user/eri/pf45/head/sys/contrib/pf/net/pf_lb.c Sat Oct 10 20:26:17 2009 (r197940) @@ -65,12 +65,16 @@ __FBSDID("$FreeBSD$"); #define NPFSYNC 0 #endif + #ifdef DEV_PFLOW + #define NPFLOW DEV_PFLOW + #else + #define NPFLOW 0 + #endif + #else #include "bpfilter.h" #include "pflog.h" #include "pfsync.h" -#endif -#ifdef notyet #include "pflow.h" #endif @@ -130,9 +134,7 @@ __FBSDID("$FreeBSD$"); #endif #include <net/pfvar.h> #include <net/if_pflog.h> -#ifdef notyet #include <net/if_pflow.h> -#endif #if NPFSYNC > 0 #include <net/if_pfsync.h> Modified: user/eri/pf45/head/sys/modules/pf/Makefile ============================================================================== --- user/eri/pf45/head/sys/modules/pf/Makefile Sat Oct 10 19:54:45 2009 (r197939) +++ user/eri/pf45/head/sys/modules/pf/Makefile Sat Oct 10 20:26:17 2009 (r197940) @@ -31,6 +31,7 @@ opt_pf.h: echo "#define DEV_PF 1" > ${.TARGET} echo "#define DEV_PFLOG 1" >> ${.TARGET} echo "#define DEV_PFSYNC 1" >> ${.TARGET} + echo "#define DEV_PFLOW 1" >> ${.TARGET} .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200910102026.n9AKQIIM091527>