diff options
| author | glebius <glebius@FreeBSD.org> | 2005-08-25 07:21:15 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2005-08-25 07:21:15 +0000 |
| commit | 36031fbf77eba8413587d15d5bafdb7387e88da0 (patch) | |
| tree | 95b5e909c7ff5a3cbc385f85ff8524624048ccf7 /sys/netgraph/ng_ksocket.c | |
| parent | c6df9cec444095b9e8012533baba3de5224e9cdc (diff) | |
| download | FreeBSD-src-36031fbf77eba8413587d15d5bafdb7387e88da0.zip FreeBSD-src-36031fbf77eba8413587d15d5bafdb7387e88da0.tar.gz | |
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
Diffstat (limited to 'sys/netgraph/ng_ksocket.c')
| -rw-r--r-- | sys/netgraph/ng_ksocket.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/netgraph/ng_ksocket.c b/sys/netgraph/ng_ksocket.c index ab021fc..a4fbdfe 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); } |
