From owner-svn-src-all@FreeBSD.ORG Thu Apr 5 04:41:07 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4C9F31065672; Thu, 5 Apr 2012 04:41:07 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3860D8FC08; Thu, 5 Apr 2012 04:41:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q354f7Gx040466; Thu, 5 Apr 2012 04:41:07 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q354f62M040464; Thu, 5 Apr 2012 04:41:06 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201204050441.q354f62M040464@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Thu, 5 Apr 2012 04:41:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233917 - head/sys/contrib/pf/net X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Apr 2012 04:41:07 -0000 Author: ae Date: Thu Apr 5 04:41:06 2012 New Revision: 233917 URL: http://svn.freebsd.org/changeset/base/233917 Log: Fix VIMAGE build. Modified: head/sys/contrib/pf/net/if_pfsync.c Modified: head/sys/contrib/pf/net/if_pfsync.c ============================================================================== --- head/sys/contrib/pf/net/if_pfsync.c Thu Apr 5 04:32:57 2012 (r233916) +++ head/sys/contrib/pf/net/if_pfsync.c Thu Apr 5 04:41:06 2012 (r233917) @@ -794,7 +794,11 @@ pfsync_state_import(struct pfsync_state timeout = r->timeout[sp->timeout]; if (!timeout) +#ifdef __FreeBSD__ + timeout = V_pf_default_rule.timeout[sp->timeout]; +#else timeout = pf_default_rule.timeout[sp->timeout]; +#endif /* sp->expire may have been adaptively scaled by export. */ st->expire -= timeout - ntohl(sp->expire);