Author: rstone
Date: Fri Mar 8 19:36:36 2013
New Revision: 248066
URL: http://svnweb.freebsd.org/changeset/base/248066
Log:
MFC r241009
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:
stable/9/sys/netgraph/ng_base.c
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/netgraph/ng_base.c
==============================================================================
--- stable/9/sys/netgraph/ng_base.c Fri Mar 8 19:16:24 2013
(r248065)
+++ stable/9/sys/netgraph/ng_base.c Fri Mar 8 19:36:36 2013
(r248066)
@@ -2005,6 +2005,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. */
@@ -2283,7 +2284,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);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
