diff --git a/[refs] b/[refs] index f6a3bc41728b..907402848651 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4fbce740f078bbc925ba5c86648d9c883968479 +refs/heads/master: c1249c0aae4c93a753c70496ab2e9a51430a6f02 diff --git a/trunk/net/socket.c b/trunk/net/socket.c index 3ca2fd9e3720..088fb3fd45e0 100644 --- a/trunk/net/socket.c +++ b/trunk/net/socket.c @@ -732,6 +732,21 @@ static int sock_recvmsg_nosec(struct socket *sock, struct msghdr *msg, return ret; } +/** + * kernel_recvmsg - Receive a message from a socket (kernel space) + * @sock: The socket to receive the message from + * @msg: Received message + * @vec: Input s/g array for message data + * @num: Size of input s/g array + * @size: Number of bytes to read + * @flags: Message flags (MSG_DONTWAIT, etc...) + * + * On return the msg structure contains the scatter/gather array passed in the + * vec argument. The array is modified so that it consists of the unfilled + * portion of the original array. + * + * The returned value is the total number of bytes received, or an error. + */ int kernel_recvmsg(struct socket *sock, struct msghdr *msg, struct kvec *vec, size_t num, size_t size, int flags) {