From owner-p4-projects@FreeBSD.ORG  Mon Nov 24 17:29:51 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7C50B16A4D0; Mon, 24 Nov 2003 17:29:51 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 57D3716A4CE
	for <perforce@freebsd.org>; Mon, 24 Nov 2003 17:29:51 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B6AEC43F75
	for <perforce@freebsd.org>; Mon, 24 Nov 2003 17:29:50 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAP1ToXJ048943
	for <perforce@freebsd.org>; Mon, 24 Nov 2003 17:29:50 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAP1ToKR048940
	for perforce@freebsd.org; Mon, 24 Nov 2003 17:29:50 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Mon, 24 Nov 2003 17:29:50 -0800 (PST)
Message-Id: <200311250129.hAP1ToKR048940@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 43022 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Nov 2003 01:29:51 -0000

http://perforce.freebsd.org/chv.cgi?CH=43022

Change 43022 by sam@sam_ebb on 2003/11/24 17:29:23

	fixup a dummynet MT_TAG reference that is now an m_tag

Affected files ...

.. //depot/projects/netperf/sys/net/bridge.c#14 edit

Differences ...

==== //depot/projects/netperf/sys/net/bridge.c#14 (text+ko) ====

@@ -920,14 +920,11 @@
 
     DDB(quad_t ticks; ticks = rdtsc();)
 
-    args.rule = NULL;		/* did we match a firewall rule ? */
-    /* Fetch state from dummynet tag, ignore others */
-    for (;m0->m_type == MT_TAG; m0 = m0->m_next)
-	if (m0->_m_tag_id == PACKET_TAG_DUMMYNET) {
-	    args.rule = ((struct dn_pkt *)m0)->rule;
-	    shared = 0;			/* For sure this is our own mbuf. */
-	}
-    if (args.rule == NULL)
+    /* did we match a firewall rule ? */
+    args.rule = ip_dn_find_rule(m0);
+    if (args.rule)
+        shared = 0;			/* For sure this is our own mbuf. */
+    else
 	bdg_thru++;			/* count 1st time through bdg_forward */
 
     /*
@@ -1046,7 +1043,6 @@
 
 	args.m = m0;		/* the packet we are looking at		*/
 	args.oif = NULL;	/* this is an input packet		*/
-	args.divert_rule = 0;	/* we do not support divert yet		*/
 	args.next_hop = NULL;	/* we do not support forward yet	*/
 	args.eh = &save_eh;	/* MAC header for bridged/MAC packets	*/
 	i = ip_fw_chk_ptr(&args);