From owner-svn-src-user@FreeBSD.ORG  Sat Oct 10 20:26:18 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5EB3C106568B;
	Sat, 10 Oct 2009 20:26:18 +0000 (UTC) (envelope-from eri@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3431B8FC14;
	Sat, 10 Oct 2009 20:26:18 +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 n9AKQITe091531;
	Sat, 10 Oct 2009 20:26:18 GMT (envelope-from eri@svn.freebsd.org)
Received: (from eri@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9AKQIIM091527;
	Sat, 10 Oct 2009 20:26:18 GMT (envelope-from eri@svn.freebsd.org)
Message-Id: <200910102026.n9AKQIIM091527@svn.freebsd.org>
From: Ermal Luçi <eri@FreeBSD.org>
Date: Sat, 10 Oct 2009 20:26:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197940 - in user/eri/pf45/head/sys: contrib/pf/net
	modules/pf
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Oct 2009 20:26:18 -0000

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