1 files changed, 15 insertions, 8 deletions

diff --git a/include/linux/socket.h b/include/linux/socket.h
index 7b3aae2052a6..edbb1d07ddf4 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -24,15 +24,16 @@ struct __kernel_sockaddr_storage {
 #include <linux/types.h>                /* pid_t                        */
 #include <linux/compiler.h>             /* __user                       */
 
+struct pid;
+struct cred;
+
 #define __sockaddr_check_size(size)     \
         BUILD_BUG_ON(((size) > sizeof(struct __kernel_sockaddr_storage)))
 
-#ifdef __KERNEL__
-# ifdef CONFIG_PROC_FS
+#ifdef CONFIG_PROC_FS
 struct seq_file;
 extern void socket_seq_show(struct seq_file *seq);
-# endif
-#endif /* __KERNEL__ */
+#endif
 
 typedef unsigned short  sa_family_t;
 
@@ -189,7 +190,9 @@ struct ucred {
 #define AF_ISDN         34      /* mISDN sockets                */
 #define AF_PHONET       35      /* Phonet sockets               */
 #define AF_IEEE802154   36      /* IEEE802154 sockets           */
-#define AF_MAX          37      /* For now.. */
+#define AF_CAIF         37      /* CAIF sockets                 */
+#define AF_ALG          38      /* Algorithm sockets            */
+#define AF_MAX          39      /* For now.. */
 
 /* Protocol families, same as address families. */
 #define PF_UNSPEC       AF_UNSPEC
@@ -229,6 +232,8 @@ struct ucred {
 #define PF_ISDN         AF_ISDN
 #define PF_PHONET       AF_PHONET
 #define PF_IEEE802154   AF_IEEE802154
+#define PF_CAIF         AF_CAIF
+#define PF_ALG          AF_ALG
 #define PF_MAX          AF_MAX
 
 /* Maximum queue length specifiable by listen.  */
@@ -255,6 +260,7 @@ struct ucred {
 #define MSG_ERRQUEUE    0x2000  /* Fetch message from error queue */
 #define MSG_NOSIGNAL    0x4000  /* Do not generate SIGPIPE */
 #define MSG_MORE        0x8000  /* Sender will send more */
+#define MSG_WAITFORONE  0x10000 /* recvmmsg(): block until 1+ packets avail */
 
 #define MSG_EOF         MSG_FIN
 
@@ -300,11 +306,14 @@ struct ucred {
 #define SOL_PNPIPE      275
 #define SOL_RDS         276
 #define SOL_IUCV        277
+#define SOL_CAIF        278
+#define SOL_ALG         279
 
 /* IPX options */
 #define IPX_TYPE        1
 
-#ifdef __KERNEL__
+extern void cred_to_ucred(struct pid *pid, const struct cred *cred, struct ucred *ucred);
+
 extern int memcpy_fromiovec(unsigned char *kdata, struct iovec *iov, int len);
 extern int memcpy_fromiovecend(unsigned char *kdata, const struct iovec *iov,
                                int offset, int len);
@@ -317,7 +326,6 @@ extern int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *ad
 extern int memcpy_toiovec(struct iovec *v, unsigned char *kdata, int len);
 extern int memcpy_toiovecend(const struct iovec *v, unsigned char *kdata,
                              int offset, int len);
-extern int move_addr_to_user(struct sockaddr *kaddr, int klen, void __user *uaddr, int __user *ulen);
 extern int move_addr_to_kernel(void __user *uaddr, int ulen, struct sockaddr *kaddr);
 extern int put_cmsg(struct msghdr*, int level, int type, int len, void *data);
 
@@ -325,6 +333,5 @@ struct timespec;
 
 extern int __sys_recvmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen,
                           unsigned int flags, struct timespec *timeout);
-#endif
 #endif /* not kernel and not glibc */
 #endif /* _LINUX_SOCKET_H */