From owner-svn-src-stable-9@FreeBSD.ORG Tue Apr 8 01:04:23 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A96CBF47; Tue, 8 Apr 2014 01:04:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 95E281BFB; Tue, 8 Apr 2014 01:04:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3814NDO020470; Tue, 8 Apr 2014 01:04:23 GMT (envelope-from dteske@svn.freebsd.org) Received: (from dteske@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3814NN0020469; Tue, 8 Apr 2014 01:04:23 GMT (envelope-from dteske@svn.freebsd.org) Message-Id: <201404080104.s3814NN0020469@svn.freebsd.org> From: Devin Teske Date: Tue, 8 Apr 2014 01:04:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r264247 - stable/9/sys/netpfil/ipfw X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Apr 2014 01:04:23 -0000 Author: dteske Date: Tue Apr 8 01:04:23 2014 New Revision: 264247 URL: http://svnweb.freebsd.org/changeset/base/264247 Log: MFC a modified version of r258588 (modification suggested by Mikolaj Golub; tested stable both original and modified versions) that fixes kernel panic when starting/stopping VIMAGE jails. Discussed with: rodrigc, Mikolaj Golub Modified: stable/9/sys/netpfil/ipfw/ip_fw_nat.c Modified: stable/9/sys/netpfil/ipfw/ip_fw_nat.c ============================================================================== --- stable/9/sys/netpfil/ipfw/ip_fw_nat.c Tue Apr 8 00:54:11 2014 (r264246) +++ stable/9/sys/netpfil/ipfw/ip_fw_nat.c Tue Apr 8 01:04:23 2014 (r264247) @@ -676,7 +676,7 @@ static moduledata_t ipfw_nat_mod = { /* Define startup order. */ #define IPFW_NAT_SI_SUB_FIREWALL SI_SUB_PROTO_IFATTACHDOMAIN -#define IPFW_NAT_MODEVENT_ORDER (SI_ORDER_ANY - 255) +#define IPFW_NAT_MODEVENT_ORDER (SI_ORDER_ANY - 128) #define IPFW_NAT_MODULE_ORDER (IPFW_NAT_MODEVENT_ORDER + 1) #define IPFW_NAT_VNET_ORDER (IPFW_NAT_MODEVENT_ORDER + 2)