From owner-svn-src-user@FreeBSD.ORG  Tue Jan  5 11:30:08 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 914D71065697;
	Tue,  5 Jan 2010 11:30:08 +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 675048FC17;
	Tue,  5 Jan 2010 11:30:08 +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 o05BU8P7082671;
	Tue, 5 Jan 2010 11:30:08 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o05BU755082669;
	Tue, 5 Jan 2010 11:30:07 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <201001051130.o05BU755082669@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Tue, 5 Jan 2010 11:30:07 +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: r201569 - user/luigi/ipfw3-head/sys/net
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: Tue, 05 Jan 2010 11:30:08 -0000

Author: luigi
Date: Tue Jan  5 11:30:06 2010
New Revision: 201569
URL: http://svn.freebsd.org/changeset/base/201569

Log:
  adjust if_bridge and if_ethersubr to the new tagging for dummynet

Modified:
  user/luigi/ipfw3-head/sys/net/if_bridge.c
  user/luigi/ipfw3-head/sys/net/if_ethersubr.c

Modified: user/luigi/ipfw3-head/sys/net/if_bridge.c
==============================================================================
--- user/luigi/ipfw3-head/sys/net/if_bridge.c	Tue Jan  5 11:00:31 2010	(r201568)
+++ user/luigi/ipfw3-head/sys/net/if_bridge.c	Tue Jan  5 11:30:06 2010	(r201569)
@@ -135,7 +135,6 @@ __FBSDID("$FreeBSD$");
 #include <net/route.h>
 #include <netinet/ip_fw.h>
 #include <netinet/ipfw/ip_fw_private.h>
-#include <netinet/ip_dummynet.h>
 
 /*
  * Size of the route hash table.  Must be a power of two.
@@ -3051,15 +3050,15 @@ bridge_pfil(struct mbuf **mp, struct ifn
 		if (mtag == NULL) {
 			args.rule.slot = 0;
 		} else {
-			struct dn_pkt_tag *dn_tag;
+			struct ipfw_rule_ref *r;
 
 			/* XXX can we free the tag after use ? */
 			mtag->m_tag_id = PACKET_TAG_NONE;
-			dn_tag = (struct dn_pkt_tag *)(mtag + 1);
+			r = (struct ipfw_rule_ref *)(mtag + 1);
 			/* packet already partially processed ? */
-			if (dn_tag->rule.slot != 0 && V_fw_one_pass)
+			if (r->info & IPFW_ONEPASS)
 				goto ipfwpass;
-			args.rule = dn_tag->rule;
+			args.rule = *r;
 		}
 
 		args.m = *mp;

Modified: user/luigi/ipfw3-head/sys/net/if_ethersubr.c
==============================================================================
--- user/luigi/ipfw3-head/sys/net/if_ethersubr.c	Tue Jan  5 11:00:31 2010	(r201568)
+++ user/luigi/ipfw3-head/sys/net/if_ethersubr.c	Tue Jan  5 11:30:06 2010	(r201569)
@@ -72,7 +72,6 @@
 #include <netinet/if_ether.h>
 #include <netinet/ip_fw.h>
 #include <netinet/ipfw/ip_fw_private.h>
-#include <netinet/ip_dummynet.h>
 #include <netinet/ip_var.h>
 #endif
 #ifdef INET6
@@ -474,15 +473,15 @@ ether_ipfw_chk(struct mbuf **m0, struct 
 	if (mtag == NULL) {
 		args.rule.slot = 0;
 	} else {
-		struct dn_pkt_tag *dn_tag;
+		/* dummynet packet, already partially processed */
+		struct ipfw_rule_ref *r;
 
 		/* XXX can we free it after use ? */
 		mtag->m_tag_id = PACKET_TAG_NONE;
-		dn_tag = (struct dn_pkt_tag *)(mtag + 1);
-		if (dn_tag->rule.slot != 0 && V_fw_one_pass)
-			/* dummynet packet, already partially processed */
+		r = (struct ipfw_rule_ref *)(mtag + 1);
+		if (r->info & IPFW_ONEPASS)
 			return (1);
-		args.rule = dn_tag->rule;
+		args.rule = *r;
 	}
 
 	/*