From owner-svn-src-all@FreeBSD.ORG  Thu Sep 27 20:12:52 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1C405106564A;
	Thu, 27 Sep 2012 20:12:52 +0000 (UTC)
	(envelope-from rstone@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 082798FC0A;
	Thu, 27 Sep 2012 20:12:52 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8RKCpBC090275;
	Thu, 27 Sep 2012 20:12:51 GMT (envelope-from rstone@svn.freebsd.org)
Received: (from rstone@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8RKCp68090272;
	Thu, 27 Sep 2012 20:12:51 GMT (envelope-from rstone@svn.freebsd.org)
Message-Id: <201209272012.q8RKCp68090272@svn.freebsd.org>
From: Ryan Stone <rstone@FreeBSD.org>
Date: Thu, 27 Sep 2012 20:12:51 +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: r241009 - head/sys/netgraph
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Thu, 27 Sep 2012 20:12:52 -0000

Author: rstone
Date: Thu Sep 27 20:12:51 2012
New Revision: 241009
URL: http://svn.freebsd.org/changeset/base/241009

Log:
  Ensure that all cases that enqueue a netgraph item for delivery by a
  ngthread properly set the item's depth to 1.  In particular, prior to this
  change if ng_snd_item failed to acquire a lock on a node, the item's depth
  would not be set at all.  This fix ensures that the error code from rcvmsg/
  rcvdata is properly passed back to the apply callback.  For example, this
  fixes a bug where an error from rcvmsg/rcvdata would not previously
  propagate back to a libnetgraph consumer when the message was queued.
  
  Reviewed by:	mav
  MFC after:	1 month
  Sponsored by:	Sandvine Incorporated

Modified:
  head/sys/netgraph/ng_base.c

Modified: head/sys/netgraph/ng_base.c
==============================================================================
--- head/sys/netgraph/ng_base.c	Thu Sep 27 20:06:37 2012	(r241008)
+++ head/sys/netgraph/ng_base.c	Thu Sep 27 20:12:51 2012	(r241009)
@@ -2008,6 +2008,7 @@ ng_queue_rw(node_p node, item_p  item, i
 		NGI_SET_WRITER(item);
 	else
 		NGI_SET_READER(item);
+	item->depth = 1;
 
 	NG_QUEUE_LOCK(ngq);
 	/* Set OP_PENDING flag and enqueue the item. */
@@ -2286,7 +2287,6 @@ ng_snd_item(item_p item, int flags)
 	}
 
 	if (queue) {
-		item->depth = 1;
 		/* Put it on the queue for that node*/
 		ng_queue_rw(node, item, rw);
 		return ((flags & NG_PROGRESS) ? EINPROGRESS : 0);