From owner-cvs-src@FreeBSD.ORG  Thu Aug 19 23:31:40 2004
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 85E2916A4CE; Thu, 19 Aug 2004 23:31:40 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 66DE743D2D; Thu, 19 Aug 2004 23:31:40 +0000 (GMT)
	(envelope-from andre@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7JNVeAf086386;
	Thu, 19 Aug 2004 23:31:40 GMT
	(envelope-from andre@repoman.freebsd.org)
Received: (from andre@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7JNVeoW086385;
	Thu, 19 Aug 2004 23:31:40 GMT
	(envelope-from andre)
Message-Id: <200408192331.i7JNVeoW086385@repoman.freebsd.org>
From: Andre Oppermann <andre@FreeBSD.org>
Date: Thu, 19 Aug 2004 23:31:40 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/netinet ip_fw2.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Aug 2004 23:31:40 -0000

andre       2004-08-19 23:31:40 UTC

  FreeBSD src repository

  Modified files:
    sys/netinet          ip_fw2.c 
  Log:
  When unloading ipfw module use callout_drain() to make absolutely sure that
  all callouts are stopped and finished.  Move it before IPFW_LOCK() to avoid
  deadlocking when draining callouts.
  
  Revision  Changes    Path
  1.73      +1 -1      src/sys/netinet/ip_fw2.c