svn commit: r334962 - head/sys/kern

[Rodney W. Grimes]

[ Charset UTF-8 unsupported, converting... ]
> 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

It is best to write commit messages that stand alone,
as at a later time when reading the log for this file
the null relative reference here may take some one
a time to figure out.

limit change of rXXXXXX to fixing controlp handling...
or something more direct would be better in the future
as one does not usually have the mail thread handy
at the time of log reading.

Thanks,
Rod

> 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)
> 
> 

-- 
Rod Grimes                                                 rgrimes at freebsd.org