From owner-p4-projects@FreeBSD.ORG  Mon Sep 29 21:30:21 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3ECAC16A4C0; Mon, 29 Sep 2003 21:30:21 -0700 (PDT)
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 1A68216A4B3
	for <perforce@freebsd.org>; Mon, 29 Sep 2003 21:30:21 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5810444013
	for <perforce@freebsd.org>; Mon, 29 Sep 2003 21:30:20 -0700 (PDT)
	(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 h8U4UKXJ042905
	for <perforce@freebsd.org>; Mon, 29 Sep 2003 21:30:20 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U4UJbh042900
	for perforce@freebsd.org; Mon, 29 Sep 2003 21:30:19 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Date: Mon, 29 Sep 2003 21:30:19 -0700 (PDT)
Message-Id: <200309300430.h8U4UJbh042900@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 38839 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, 30 Sep 2003 04:30:21 -0000

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

Change 38839 by sam@sam_ebb on 2003/09/29 21:30:00

	correct pfil_run_hooks handling

Affected files ...

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

Differences ...

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

@@ -1020,13 +1020,11 @@
 	    ip->ip_off = ntohs(ip->ip_off);
 
 	    if (pfil_run_hooks(&inet_pfil_hook, &m0, src, PFIL_IN) != 0) {
-		EH_RESTORE(m0);		/* restore Ethernet header */
-		return m0;
-	    }
-	    if (m0 == NULL) {
-		bdg_dropped++;
+		/* NB: hook should consume packet */
 		return NULL;
 	    }
+	    if (m0 == NULL)			/* consumed by filter */
+		return m0;
 	    /*
 	     * If we get here, the firewall has passed the pkt, but the mbuf
 	     * pointer might have changed. Restore ip and the fields ntohs()'d.