From owner-cvs-all@FreeBSD.ORG Fri Jun 10 12:28:18 2005 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4CEED16A41F; Fri, 10 Jun 2005 12:28:18 +0000 (GMT) (envelope-from green@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 17F4443D48; Fri, 10 Jun 2005 12:28:18 +0000 (GMT) (envelope-from green@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5ACSHPc049247; Fri, 10 Jun 2005 12:28:17 GMT (envelope-from green@repoman.freebsd.org) Received: (from green@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5ACSHoS049246; Fri, 10 Jun 2005 12:28:17 GMT (envelope-from green) Message-Id: <200506101228.j5ACSHoS049246@repoman.freebsd.org> From: Brian Feldman Date: Fri, 10 Jun 2005 12:28:17 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/sys/netinet ip_fw2.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jun 2005 12:28:18 -0000 green 2005-06-10 12:28:17 UTC FreeBSD src repository Modified files: sys/netinet ip_fw2.c Log: Modify send_pkt() to return the generated packet and have the caller do the subsequent ip_output() in IPFW. In ipfw_tick(), the keep-alive packets must be generated from the data that resides under the stateful lock, but they must not be sent at that time, as this would cause a lock order reversal with the normal ordering (interface's lock, then locks belonging to the pfil hooks). In practice, this caused deadlocks when using IPFW and if_bridge(4) together to do stateful transparent filtering. MFC after: 1 week Revision Changes Path 1.101 +32 -8 src/sys/netinet/ip_fw2.c