From owner-p4-projects@FreeBSD.ORG  Sat May 31 17:03:35 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EFB1B1065675; Sat, 31 May 2008 17:03:34 +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 B1D291065670
	for <perforce@FreeBSD.org>; Sat, 31 May 2008 17:03:34 +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 8E2098FC15
	for <perforce@FreeBSD.org>; Sat, 31 May 2008 17:03:34 +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 m4VH3YuO048277
	for <perforce@FreeBSD.org>; Sat, 31 May 2008 17:03:34 GMT
	(envelope-from gk@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4VH3YCB048275
	for perforce@freebsd.org; Sat, 31 May 2008 17:03:34 GMT
	(envelope-from gk@FreeBSD.org)
Date: Sat, 31 May 2008 17:03:34 GMT
Message-Id: <200805311703.m4VH3YCB048275@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 142638 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: Sat, 31 May 2008 17:03:35 -0000

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

Change 142638 by gk@gk_h1 on 2008/05/31 17:03:05

	It's ok to call malloc(M_WAITOK) here

Affected files ...

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

Differences ...

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

@@ -577,8 +577,8 @@
 
 	pfh_ether = pfil_head_get(PFIL_TYPE_IFT, IFT_ETHER);
 	if (pfh_ether != NULL) {
-		pfil_remove_hook(ipfw_ether_check_in, NULL, PFIL_IN , pfh_ether);
-		pfil_remove_hook(ipfw_ether_check_out, NULL, PFIL_OUT, pfh_ether);
+		pfil_remove_hook(ipfw_ether_check_in, NULL, PFIL_IN | PFIL_WAITOK, pfh_ether);
+		pfil_remove_hook(ipfw_ether_check_out, NULL, PFIL_OUT | PFIL_WAITOK, pfh_ether);
 	}
 
 	if (pfh_inet == NULL || pfh_ether == NULL)