From owner-svn-src-head@FreeBSD.ORG  Wed May 28 23:01:20 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 BB418BBE;
 Wed, 28 May 2014 23:01:20 +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 A76832F6D;
 Wed, 28 May 2014 23:01:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4SN1KJ6020804;
 Wed, 28 May 2014 23:01:20 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4SN1Kcv020803;
 Wed, 28 May 2014 23:01:20 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201405282301.s4SN1Kcv020803@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Wed, 28 May 2014 23:01:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r266822 - head/sys/netipsec
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 May 2014 23:01:20 -0000

Author: bz
Date: Wed May 28 23:01:20 2014
New Revision: 266822
URL: http://svnweb.freebsd.org/changeset/base/266822

Log:
  Use IPv4 statistics in ipsec4_process_packet() rather than the IPv6
  version.  This also unbreaks the NOINET6 builds after r266800.

Modified:
  head/sys/netipsec/ipsec_output.c

Modified: head/sys/netipsec/ipsec_output.c
==============================================================================
--- head/sys/netipsec/ipsec_output.c	Wed May 28 19:59:27 2014	(r266821)
+++ head/sys/netipsec/ipsec_output.c	Wed May 28 23:01:20 2014	(r266822)
@@ -576,7 +576,7 @@ ipsec4_process_packet(
 		DPRINTF(("%s: unsupported protocol family %u\n",
 				 __func__, dst->sa.sa_family));
 			error = EPFNOSUPPORT;
-			IPSEC6STAT_INC(ips_out_inval);
+			IPSECSTAT_INC(ips_out_inval);
 			goto bad;
 		}
 		error = (*sav->tdb_xform->xf_output)(m, isr, NULL, i, off);
@@ -739,4 +739,4 @@ bad:
 		m_freem(m);
 	return error;
 }
-#endif /*INET6*/
\ No newline at end of file
+#endif /*INET6*/