diff options
| author | glebius <glebius@FreeBSD.org> | 2014-11-14 15:33:40 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2014-11-14 15:33:40 +0000 |
| commit | de0e48fa9ad635d1754371cbc48664a7b89a50a0 (patch) | |
| tree | 71bd56621853e1393318d95520b5a16eb735791a /sys/kern | |
| parent | 5a1bee9f607fa71a665e733e75435530500b7eb8 (diff) | |
| download | FreeBSD-src-de0e48fa9ad635d1754371cbc48664a7b89a50a0.zip FreeBSD-src-de0e48fa9ad635d1754371cbc48664a7b89a50a0.tar.gz | |
Merge from projects/sendfile:
Use sbcut_locked() instead of manually editing a sockbuf.
Sponsored by: Nginx, Inc.
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/uipc_socket.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index e2fd1f3..1cd2206 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1809,9 +1809,7 @@ dontblock: SOCKBUF_LOCK(&so->so_rcv); } } - m->m_data += len; - m->m_len -= len; - so->so_rcv.sb_cc -= len; + sbcut_locked(&so->so_rcv, len); } } SOCKBUF_LOCK_ASSERT(&so->so_rcv); |
