Date: Mon, 11 Jun 2018 17:10:20 +0000 (UTC) From: Matt Macy <mmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r334962 - head/sys/kern Message-ID: <201806111710.w5BHAKr1069743@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mmacy Date: Mon Jun 11 17:10:19 2018 New Revision: 334962 URL: https://svnweb.freebsd.org/changeset/base/334962 Log: limit change to fixing controlp handling pending review Modified: head/sys/kern/uipc_socket.c Modified: head/sys/kern/uipc_socket.c ============================================================================== --- head/sys/kern/uipc_socket.c Mon Jun 11 16:33:36 2018 (r334961) +++ head/sys/kern/uipc_socket.c Mon Jun 11 17:10:19 2018 (r334962) @@ -2180,8 +2180,6 @@ soreceive_stream(struct socket *so, struct sockaddr ** flags = *flagsp &~ MSG_EOR; else flags = 0; - if (flags & (MSG_PEEK|MSG_WAITALL)) - return (soreceive_generic(so, psa, uio, mp0, controlp, flagsp)); if (controlp != NULL) *controlp = NULL; if (flags & MSG_OOB)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806111710.w5BHAKr1069743>