Merge branch 'master' into staging-next

We need the network changes in staging-next in order to be able to fix
up the rtl8821ae driver to build properly.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 7 insertions, 9 deletions

diff --git a/include/linux/socket.h b/include/linux/socket.h
index 445ef7519dc2..8e98297f1388 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -45,13 +45,13 @@ struct linger {
  */
  
 struct msghdr {
-        void    *       msg_name;       /* Socket name                  */
-        int             msg_namelen;    /* Length of name               */
-        struct iovec *  msg_iov;        /* Data blocks                  */
-        __kernel_size_t msg_iovlen;     /* Number of blocks             */
-        void    *       msg_control;    /* Per protocol magic (eg BSD file descriptor passing) */
-        __kernel_size_t msg_controllen; /* Length of cmsg list */
-        unsigned int    msg_flags;
+        void            *msg_name;      /* ptr to socket address structure */
+        int             msg_namelen;    /* size of socket address structure */
+        struct iovec    *msg_iov;       /* scatter/gather array */
+        __kernel_size_t msg_iovlen;     /* # elements in msg_iov */
+        void            *msg_control;   /* ancillary data */
+        __kernel_size_t msg_controllen; /* ancillary data buffer length */
+        unsigned int    msg_flags;      /* flags on received message */
 };
 
 /* For recvmmsg/sendmmsg */
@@ -305,8 +305,6 @@ struct ucred {
 /* IPX options */
 #define IPX_TYPE        1
 
-extern void cred_to_ucred(struct pid *pid, const struct cred *cred, struct ucred *ucred);
-
 extern int memcpy_fromiovecend(unsigned char *kdata, const struct iovec *iov,
                                int offset, int len);
 extern int csum_partial_copy_fromiovecend(unsigned char *kdata,