From owner-svn-src-user@FreeBSD.ORG  Sat Jan 23 22:21:56 2010
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 A34BD1065672;
	Sat, 23 Jan 2010 22:21:56 +0000 (UTC)
	(envelope-from luigi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 864D28FC1A;
	Sat, 23 Jan 2010 22:21:56 +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 o0NMLu2u036089;
	Sat, 23 Jan 2010 22:21:56 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0NMLuif036084;
	Sat, 23 Jan 2010 22:21:56 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <201001232221.o0NMLuif036084@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Sat, 23 Jan 2010 22:21:56 +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: r202901 - user/luigi/ipfw3-head/sys/netinet/ipfw
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, 23 Jan 2010 22:21:56 -0000

Author: luigi
Date: Sat Jan 23 22:21:56 2010
New Revision: 202901
URL: http://svn.freebsd.org/changeset/base/202901

Log:
  refine includes for testing

Modified:
  user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_fifo.c
  user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_rr.c
  user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_wf2q.c
  user/luigi/ipfw3-head/sys/netinet/ipfw/dn_test.h

Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_fifo.c
==============================================================================
--- user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_fifo.c	Sat Jan 23 22:11:18 2010	(r202900)
+++ user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_fifo.c	Sat Jan 23 22:21:56 2010	(r202901)
@@ -35,13 +35,13 @@
 #include <netinet/in.h>
 #include <netinet/ip_var.h>		/* ipfw_rule_ref */
 #include <netinet/ip_fw.h>	/* flow_id */
-#else
-#include "dn_test.h"
-#endif
 #include <netinet/ip_dummynet.h>
 #include <netinet/ipfw/dn_heap.h>
 #include <netinet/ipfw/ip_dn_private.h>
 #include <netinet/ipfw/dn_sched.h>
+#else
+#include "dn_test.h"
+#endif
 
 /*
  * This file implements a FIFO scheduler for a single queue.

Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_rr.c
==============================================================================
--- user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_rr.c	Sat Jan 23 22:11:18 2010	(r202900)
+++ user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_rr.c	Sat Jan 23 22:21:56 2010	(r202901)
@@ -35,13 +35,13 @@
 #include <netinet/in.h>
 #include <netinet/ip_var.h>		/* ipfw_rule_ref */
 #include <netinet/ip_fw.h>	/* flow_id */
-#else
-#include <netinet/ipfw/dn_test.h>
-#endif
 #include <netinet/ip_dummynet.h>
 #include <netinet/ipfw/dn_heap.h>
 #include <netinet/ipfw/ip_dn_private.h>
 #include <netinet/ipfw/dn_sched.h>
+#else
+#include "dn_test.h"
+#endif
 
 #define DN_SCHED_RR	3 // XXX Where?
 

Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_wf2q.c
==============================================================================
--- user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_wf2q.c	Sat Jan 23 22:11:18 2010	(r202900)
+++ user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_wf2q.c	Sat Jan 23 22:21:56 2010	(r202901)
@@ -36,13 +36,13 @@
 #include <netinet/in.h>
 #include <netinet/ip_var.h>		/* ipfw_rule_ref */
 #include <netinet/ip_fw.h>	/* flow_id */
-#else
-#include <netinet/ipfw/dn_test.h>
-#endif
 #include <netinet/ip_dummynet.h>
 #include <netinet/ipfw/dn_heap.h>
 #include <netinet/ipfw/ip_dn_private.h>
 #include <netinet/ipfw/dn_sched.h>
+#else
+#include "dn_test.h"
+#endif
 
 #ifndef MAX64
 #define MAX64(x,y)  (( (int64_t) ( (y)-(x) )) > 0 ) ? (y) : (x)

Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/dn_test.h
==============================================================================
--- user/luigi/ipfw3-head/sys/netinet/ipfw/dn_test.h	Sat Jan 23 22:11:18 2010	(r202900)
+++ user/luigi/ipfw3-head/sys/netinet/ipfw/dn_test.h	Sat Jan 23 22:21:56 2010	(r202901)
@@ -25,6 +25,7 @@ struct mbuf {
 		int len;
 	} m_pkthdr;
 	struct mbuf *m_nextpkt;
+	int flow_id;
 };
 typedef void * module_t;
 struct _md_t {
@@ -37,4 +38,9 @@ typedef struct _md_t moduledata_t;
 	moduledata_t *_g_##name = & name##_mod
 #define MODULE_DEPEND(a, b, c, d, e)
 
+#include <netinet/ip_dummynet.h>
+#include <netinet/ipfw/dn_heap.h>
+#include <netinet/ipfw/ip_dn_private.h>
+#include <netinet/ipfw/dn_sched.h>
+
 #endif /* _DN_TEST_H */