svn commit: r220913 - stable/8/sys/netgraph

[Gleb Smirnoff]

Author: glebius
Date: Thu Apr 21 08:15:29 2011
New Revision: 220913
URL: http://svn.freebsd.org/changeset/base/220913

Log:
  Merge from head/ 220745:
    Fix error where error variable was assigned result of comparison,
    instead of function return value.
  
    Submitted by: Przemyslaw Frasunek <przemyslaw frasunek.com>

Modified:
  stable/8/sys/netgraph/ng_base.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/netgraph/ng_base.c
==============================================================================
--- stable/8/sys/netgraph/ng_base.c	Thu Apr 21 08:13:44 2011	(r220912)
+++ stable/8/sys/netgraph/ng_base.c	Thu Apr 21 08:15:29 2011	(r220913)
@@ -596,7 +596,7 @@ ng_make_node(const char *typename, node_
 	 */
 	if (type->constructor != NULL) {
 		if ((error = ng_make_node_common(type, nodepp)) == 0) {
-			if ((error = ((*type->constructor)(*nodepp)) != 0)) {
+			if ((error = ((*type->constructor)(*nodepp))) != 0) {
 				NG_NODE_UNREF(*nodepp);
 			}
 		}