From owner-p4-projects@FreeBSD.ORG  Sat Feb 28 19:14:23 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B6FB916A4D0; Sat, 28 Feb 2004 19:14:22 -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 76F3816A4CE
	for <perforce@freebsd.org>; Sat, 28 Feb 2004 19:14:22 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 71DDC43D1D
	for <perforce@freebsd.org>; Sat, 28 Feb 2004 19:14:22 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1T3EMGe049887
	for <perforce@freebsd.org>; Sat, 28 Feb 2004 19:14:22 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1T3EMK2049884
	for perforce@freebsd.org; Sat, 28 Feb 2004 19:14:22 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 28 Feb 2004 19:14:22 -0800 (PST)
Message-Id: <200402290314.i1T3EMK2049884@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 47846 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: Sun, 29 Feb 2004 03:14:23 -0000

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

Change 47846 by rwatson@rwatson_tislabs on 2004/02/28 19:14:02

	Fix botched integ -- use ip_dn_claim_rule(), synchronize
	whitespace to HEAD.

Affected files ...

.. //depot/projects/netperf_socket/sys/net/bridge.c#4 edit

Differences ...

==== //depot/projects/netperf_socket/sys/net/bridge.c#4 (text+ko) ====

@@ -920,10 +920,9 @@
 
     DDB(quad_t ticks; ticks = rdtsc();)
 
-    /* did we match a firewall rule ? */
-    args.rule = ip_dn_find_rule(m0);
+    args.rule = ip_dn_claim_rule(m0);
     if (args.rule)
-        shared = 0;			/* For sure this is our own mbuf. */
+	shared = 0;			/* For sure this is our own mbuf. */
     else
 	bdg_thru++;			/* count 1st time through bdg_forward */