From owner-svn-src-all@FreeBSD.ORG Thu Jan 2 08:39:48 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7E3C2F54; Thu, 2 Jan 2014 08:39:48 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6A05F122D; Thu, 2 Jan 2014 08:39:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s028dmI8097430; Thu, 2 Jan 2014 08:39:48 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s028dmXZ097429; Thu, 2 Jan 2014 08:39:48 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201401020839.s028dmXZ097429@svn.freebsd.org> From: Xin LI Date: Thu, 2 Jan 2014 08:39:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r260186 - head/sys/netgraph/netflow X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 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, 02 Jan 2014 08:39:48 -0000 Author: delphij Date: Thu Jan 2 08:39:47 2014 New Revision: 260186 URL: http://svnweb.freebsd.org/changeset/base/260186 Log: Fix !INET6 build for various platforms. Modified: head/sys/netgraph/netflow/netflow.c Modified: head/sys/netgraph/netflow/netflow.c ============================================================================== --- head/sys/netgraph/netflow/netflow.c Thu Jan 2 08:10:35 2014 (r260185) +++ head/sys/netgraph/netflow/netflow.c Thu Jan 2 08:39:47 2014 (r260186) @@ -278,7 +278,9 @@ ng_netflow_copyinfo(priv_p priv, struct i->nfinfo_inact_exp = counter_u64_fetch(priv->nfinfo_inact_exp); i->nfinfo_used = uma_zone_get_cur(priv->zone); +#ifdef INET6 i->nfinfo_used6 = uma_zone_get_cur(priv->zone6); +#endif i->nfinfo_alloc_failed = priv->nfinfo_alloc_failed; i->nfinfo_export_failed = priv->nfinfo_export_failed;