diff options
| author | rstone <rstone@FreeBSD.org> | 2012-09-27 20:12:51 +0000 |
|---|---|---|
| committer | rstone <rstone@FreeBSD.org> | 2012-09-27 20:12:51 +0000 |
| commit | 9462cb164169ec9d8c369c666eac8bd7e7476de7 (patch) | |
| tree | 2c8fe38dcfd2eb69340ca18ad589a36d059c44f4 /sys/netgraph | |
| parent | 2971b4a1848640e101b8f4080426f14ec481a081 (diff) | |
| download | FreeBSD-src-9462cb164169ec9d8c369c666eac8bd7e7476de7.zip FreeBSD-src-9462cb164169ec9d8c369c666eac8bd7e7476de7.tar.gz | |
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
Diffstat (limited to 'sys/netgraph')
| -rw-r--r-- | sys/netgraph/ng_base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/netgraph/ng_base.c b/sys/netgraph/ng_base.c index 0856e80..6143464 100644 --- a/sys/netgraph/ng_base.c +++ b/sys/netgraph/ng_base.c @@ -2008,6 +2008,7 @@ ng_queue_rw(node_p node, item_p item, int rw) NGI_SET_WRITER(item); else NGI_SET_READER(item); + item->depth = 1; NG_QUEUE_LOCK(ngq); /* Set OP_PENDING flag and enqueue the item. */ @@ -2286,7 +2287,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); |
