From owner-svn-src-all@FreeBSD.ORG  Wed Jan 22 10:38:01 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 CC4C1481;
 Wed, 22 Jan 2014 10:38:01 +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 B7731191F;
 Wed, 22 Jan 2014 10:38:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0MAc16K087111;
 Wed, 22 Jan 2014 10:38:01 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0MAc1lf087110;
 Wed, 22 Jan 2014 10:38:01 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201401221038.s0MAc1lf087110@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Wed, 22 Jan 2014 10:38:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r261022 - stable/10/sys/netgraph
X-SVN-Group: stable-10
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 &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Jan 2014 10:38:01 -0000

Author: glebius
Date: Wed Jan 22 10:38:01 2014
New Revision: 261022
URL: http://svnweb.freebsd.org/changeset/base/261022

Log:
  Merge r260046:  Fix the parse type for NGM_LISTTYPES.

Modified:
  stable/10/sys/netgraph/ng_base.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netgraph/ng_base.c
==============================================================================
--- stable/10/sys/netgraph/ng_base.c	Wed Jan 22 10:35:30 2014	(r261021)
+++ stable/10/sys/netgraph/ng_base.c	Wed Jan 22 10:38:01 2014	(r261022)
@@ -468,7 +468,7 @@ static const struct ng_parse_type ng_gen
 	&ng_generic_linkinfo_array_type_info
 };
 
-DEFINE_PARSE_STRUCT_TYPE(typelist, TYPELIST, (&ng_generic_nodeinfoarray_type));
+DEFINE_PARSE_STRUCT_TYPE(typelist, TYPELIST, (&ng_generic_typeinfoarray_type));
 DEFINE_PARSE_STRUCT_TYPE(hooklist, HOOKLIST,
 	(&ng_generic_nodeinfo_type, &ng_generic_linkinfo_array_type));
 DEFINE_PARSE_STRUCT_TYPE(listnodes, LISTNODES,
@@ -544,7 +544,7 @@ static const struct ng_cmdlist ng_generi
 	  NGM_LISTTYPES,
 	  "listtypes",
 	  NULL,
-	  &ng_generic_typeinfo_type
+	  &ng_generic_typelist_type
 	},
 	{
 	  NGM_GENERIC_COOKIE,