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
This commit is contained in:
parent
4053cae340
commit
d7f56eabab
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=149447
@ -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);
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user