From 36031fbf77eba8413587d15d5bafdb7387e88da0 Mon Sep 17 00:00:00 2001 From: glebius Date: Thu, 25 Aug 2005 07:21:15 +0000 Subject: [PATCH] Backout revision 1.54, because it exposes a worse problem, than it fixes. I believe the problem lives somewhere outside ng_ksocket, but until it is found, let the node be working. PR: kern/84952 PR: kern/82413 MFC after: 3 days --- sys/netgraph/ng_ksocket.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/netgraph/ng_ksocket.c b/sys/netgraph/ng_ksocket.c index ab021fc6f1dc..a4fbdfe2a28e 100644 --- a/sys/netgraph/ng_ksocket.c +++ b/sys/netgraph/ng_ksocket.c @@ -1001,8 +1001,6 @@ ng_ksocket_disconnect(hook_p hook) * the request has at least been done, but the 'so' may not be so lucky. * handle this by checking the validity of the node in the target function * before dereferencing the socket pointer. - * - * To decouple stack, we use queue version of ng_send_fn(). */ static void @@ -1013,7 +1011,7 @@ ng_ksocket_incoming(struct socket *so, void *arg, int waitflag) wait = (waitflag & M_WAITOK) ? NG_WAITOK : 0; ng_send_fn1(node, NULL, &ng_ksocket_incoming2, so, waitflag, - wait | NG_QUEUE); + wait); }