From owner-svn-src-user@FreeBSD.ORG  Fri Dec 25 16:53:15 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 45935106568F;
	Fri, 25 Dec 2009 16:53:15 +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 340488FC16;
	Fri, 25 Dec 2009 16:53:15 +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 nBPGrF1f066455;
	Fri, 25 Dec 2009 16:53:15 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBPGrFBK066452;
	Fri, 25 Dec 2009 16:53:15 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <200912251653.nBPGrFBK066452@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Fri, 25 Dec 2009 16:53:15 +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: r200989 - 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: Fri, 25 Dec 2009 16:53:15 -0000

Author: luigi
Date: Fri Dec 25 16:53:14 2009
New Revision: 200989
URL: http://svn.freebsd.org/changeset/base/200989

Log:
  expand inline a function removed from the header

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	Fri Dec 25 15:29:18 2009	(r200988)
+++ user/luigi/ipfw3-head/sys/net/if_bridge.c	Fri Dec 25 16:53:14 2009	(r200989)
@@ -3041,13 +3041,17 @@ bridge_pfil(struct mbuf **mp, struct ifn
 
 	/* XXX this section is also in if_ethersubr.c */
 	if (V_ip_fw_chk_ptr && pfil_ipfw != 0 && dir == PFIL_OUT && ifp != NULL) {
-		struct dn_pkt_tag *dn_tag;
+		struct m_tag *mtag;
 
 		error = -1;
-		dn_tag = ip_dn_claim_tag(*mp);
-		if (dn_tag == NULL) {
+		mtag = m_tag_find(*mp, PACKET_TAG_DUMMYNET, NULL);
+		if (mtag == NULL) {
 			args.slot = 0;
 		} else {
+			struct dn_pkt_tag *dn_tag;
+
+			mtag->m_tag_id = PACKET_TAG_NONE;
+			dn_tag = (struct dn_pkt_tag *)(mtag + 1);
 			if (dn_tag->slot != 0 && V_fw_one_pass)
 				/* packet already partially processed */
 				goto ipfwpass;

Modified: user/luigi/ipfw3-head/sys/net/if_ethersubr.c
==============================================================================
--- user/luigi/ipfw3-head/sys/net/if_ethersubr.c	Fri Dec 25 15:29:18 2009	(r200988)
+++ user/luigi/ipfw3-head/sys/net/if_ethersubr.c	Fri Dec 25 16:53:14 2009	(r200989)
@@ -467,13 +467,16 @@ ether_ipfw_chk(struct mbuf **m0, struct 
 	struct mbuf *m;
 	int i;
 	struct ip_fw_args args;
-	struct dn_pkt_tag *dn_tag;
+	struct m_tag *mtag;
 
-	dn_tag = ip_dn_claim_tag(*m0);
-
-	if (dn_tag == NULL) {
+	mtag = m_tag_find(*m0, PACKET_TAG_DUMMYNET, NULL);
+	if (mtag == NULL) {
 		args.slot = 0;
 	} else {
+		struct dn_pkt_tag *dn_tag;
+
+		mtag->m_tag_id = PACKET_TAG_NONE;
+		dn_tag = (struct dn_pkt_tag *)(mtag + 1);
 		if (dn_tag->slot != 0 && V_fw_one_pass)
 			/* dummynet packet, already partially processed */
 			return (1);