Improve apply callback error reporting:

Before this patch callback returned result of the last finished call chain.
Now it returns last nonzero result from all call chain results in this request.

As soon as this improvement gives reliable error reporting, it is now possible
to remove dirty workaround in ng_socket, made to return ENOBUFS error statuses
of request-response operations. That workaround was responsible for returning
ENOBUFS errors to completely unrelated requests working at the same time
on socket.

1 files changed, 2 insertions, 1 deletions

diff --git a/sys/netgraph/netgraph.h b/sys/netgraph/netgraph.h
index 69559ce063d6..e0b53d1bd73c 100644
--- a/sys/netgraph/netgraph.h
+++ b/sys/netgraph/netgraph.h
@@ -608,6 +608,7 @@ struct ng_apply_info {
 	ng_apply_t	*apply;
 	void		*context;
 	int		refs;
+	int		error;
 };
 struct ng_item {
 	u_long	el_flags;
@@ -634,7 +635,7 @@ struct ng_item {
 	 * and its context.
 	 */
 	struct ng_apply_info	*apply;
-	void		*PAD1;
+	uintptr_t		depth;
 #ifdef	NETGRAPH_DEBUG /*----------------------------------------------*/
 	char *lastfile;
 	int  lastline;