From owner-p4-projects@FreeBSD.ORG  Tue Jun  3 18:00:40 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 340181065678; Tue,  3 Jun 2008 18:00:40 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EA87B1065675
	for <perforce@FreeBSD.org>; Tue,  3 Jun 2008 18:00:39 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DE5EC8FC1C
	for <perforce@FreeBSD.org>; Tue,  3 Jun 2008 18:00:39 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m53I0dij094941
	for <perforce@FreeBSD.org>; Tue, 3 Jun 2008 18:00:39 GMT
	(envelope-from gk@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m53I0dOQ094939
	for perforce@freebsd.org; Tue, 3 Jun 2008 18:00:39 GMT
	(envelope-from gk@FreeBSD.org)
Date: Tue, 3 Jun 2008 18:00:39 GMT
Message-Id: <200806031800.m53I0dOQ094939@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gk@FreeBSD.org using -f
From: Gleb Kurtsou <gk@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 142838 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 03 Jun 2008 18:00:40 -0000

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

Change 142838 by gk@gk_h1 on 2008/06/03 17:59:53

	fix bugs: ipfw was disabled. malloc(M_WAITOK) is ok in ipfw_*hook

Affected files ...

.. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fw_pfil.c#4 edit

Differences ...

==== //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fw_pfil.c#4 (text+ko) ====

@@ -547,15 +547,15 @@
 	struct pfil_head *pfh_inet, *pfh_ether;
 
 	pfh_inet = pfil_head_get(PFIL_TYPE_AF, AF_INET);
-	if (pfh_inet == NULL) {
+	if (pfh_inet != NULL) {
 		pfil_add_hook(ipfw_check_in, NULL, PFIL_IN | PFIL_WAITOK, pfh_inet);
 		pfil_add_hook(ipfw_check_out, NULL, PFIL_OUT | PFIL_WAITOK, pfh_inet);
 	}
 
 	pfh_ether = pfil_head_get(PFIL_TYPE_IFT, IFT_ETHER);
 	if (pfh_ether != NULL) {
-		pfil_add_hook(ipfw_ether_check_in, NULL, PFIL_IN, pfh_ether);
-		pfil_add_hook(ipfw_ether_check_out, NULL, PFIL_OUT, pfh_ether);
+		pfil_add_hook(ipfw_ether_check_in, NULL, PFIL_IN | PFIL_WAITOK, pfh_ether);
+		pfil_add_hook(ipfw_ether_check_out, NULL, PFIL_OUT | PFIL_WAITOK, pfh_ether);
 	}
 
 	if (pfh_inet == NULL || pfh_ether == NULL)