diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2021-12-08 23:43:50 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2021-12-08 23:43:50 -0800 |
| commit | 5d8dfaa71d87f742c53309b95cb6a8b274119027 (patch) | |
| tree | 83fa5199868fb98dbe7dcb0791bc462bac77265b /include/linux/socket.h | |
| parent | 8c374ef45416281c7172dc29ed438dfb445795f1 (diff) | |
| parent | 8bb7eca972ad531c9b149c0a51ab43a417385813 (diff) | |
| download | cachepc-linux-5d8dfaa71d87f742c53309b95cb6a8b274119027.tar.gz cachepc-linux-5d8dfaa71d87f742c53309b95cb6a8b274119027.zip | |
Merge tag 'v5.15' into next
Sync up with the mainline to get the latest APIs and DT bindings.
Diffstat (limited to 'include/linux/socket.h')
| -rw-r--r-- | include/linux/socket.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/linux/socket.h b/include/linux/socket.h index 0d8e3dcb7f88..041d6032a348 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -223,8 +223,11 @@ struct ucred { * reuses AF_INET address family */ #define AF_XDP 44 /* XDP sockets */ +#define AF_MCTP 45 /* Management component + * transport protocol + */ -#define AF_MAX 45 /* For now.. */ +#define AF_MAX 46 /* For now.. */ /* Protocol families, same as address families. */ #define PF_UNSPEC AF_UNSPEC @@ -274,6 +277,7 @@ struct ucred { #define PF_QIPCRTR AF_QIPCRTR #define PF_SMC AF_SMC #define PF_XDP AF_XDP +#define PF_MCTP AF_MCTP #define PF_MAX AF_MAX /* Maximum queue length specifiable by listen. */ @@ -421,6 +425,9 @@ extern int __sys_accept4_file(struct file *file, unsigned file_flags, struct sockaddr __user *upeer_sockaddr, int __user *upeer_addrlen, int flags, unsigned long nofile); +extern struct file *do_accept(struct file *file, unsigned file_flags, + struct sockaddr __user *upeer_sockaddr, + int __user *upeer_addrlen, int flags); extern int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr, int __user *upeer_addrlen, int flags); extern int __sys_socket(int family, int type, int protocol); |