From owner-svn-src-head@FreeBSD.ORG Mon Apr 18 09:14:24 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 750011065674; Mon, 18 Apr 2011 09:14:24 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 497E08FC18; Mon, 18 Apr 2011 09:14:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p3I9EO4K065254; Mon, 18 Apr 2011 09:14:24 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3I9EOXs065250; Mon, 18 Apr 2011 09:14:24 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201104180914.p3I9EOXs065250@svn.freebsd.org> From: Gleb Smirnoff Date: Mon, 18 Apr 2011 09:14:24 +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: r220769 - head/sys/netgraph/netflow X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2011 09:14:24 -0000 Author: glebius Date: Mon Apr 18 09:14:23 2011 New Revision: 220769 URL: http://svn.freebsd.org/changeset/base/220769 Log: ng_netflow_cache_init() can be void. Modified: head/sys/netgraph/netflow/netflow.c head/sys/netgraph/netflow/ng_netflow.c head/sys/netgraph/netflow/ng_netflow.h Modified: head/sys/netgraph/netflow/netflow.c ============================================================================== --- head/sys/netgraph/netflow/netflow.c Mon Apr 18 09:12:27 2011 (r220768) +++ head/sys/netgraph/netflow/netflow.c Mon Apr 18 09:14:23 2011 (r220769) @@ -503,7 +503,7 @@ hash6_insert(priv_p priv, struct flow6_h */ /* Allocate memory and set up flow cache */ -int +void ng_netflow_cache_init(priv_p priv) { struct flow_hash_entry *hsh; @@ -546,8 +546,6 @@ ng_netflow_cache_init(priv_p priv) ng_netflow_v9_cache_init(priv); CTR0(KTR_NET, "ng_netflow startup()"); - - return (0); } /* Initialize new FIB table for v5 and v9 */ Modified: head/sys/netgraph/netflow/ng_netflow.c ============================================================================== --- head/sys/netgraph/netflow/ng_netflow.c Mon Apr 18 09:12:27 2011 (r220768) +++ head/sys/netgraph/netflow/ng_netflow.c Mon Apr 18 09:14:23 2011 (r220769) @@ -220,7 +220,7 @@ static int ng_netflow_constructor(node_p node) { priv_p priv; - int error = 0, i; + int i; /* Initialize private data */ priv = malloc(sizeof(*priv), M_NETGRAPH, M_WAITOK | M_ZERO); @@ -241,8 +241,7 @@ ng_netflow_constructor(node_p node) callout_init(&priv->exp_callout, CALLOUT_MPSAFE); /* Allocate memory and set up flow cache */ - if ((error = ng_netflow_cache_init(priv))) - return (error); + ng_netflow_cache_init(priv); return (0); } Modified: head/sys/netgraph/netflow/ng_netflow.h ============================================================================== --- head/sys/netgraph/netflow/ng_netflow.h Mon Apr 18 09:12:27 2011 (r220768) +++ head/sys/netgraph/netflow/ng_netflow.h Mon Apr 18 09:14:23 2011 (r220769) @@ -458,7 +458,7 @@ struct flow6_hash_entry { ((t) << 3)) /* 8 */ /* Prototypes for netflow.c */ -int ng_netflow_cache_init(priv_p); +void ng_netflow_cache_init(priv_p); void ng_netflow_cache_flush(priv_p); int ng_netflow_fib_init(priv_p priv, int fib); void ng_netflow_copyinfo(priv_p, struct ng_netflow_info *);