diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2025-12-17 08:29:38 +0300 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2025-12-17 08:29:38 +0300 |
| commit | ec439c38013550420aecc15988ae6acb670838c1 (patch) | |
| tree | acbc097463cf0ca151d1197c0d1eec72dafef54d /include/linux/socket.h | |
| parent | e7a0adb03dfe1877a11e45a8707e69ba8f4cf94c (diff) | |
| parent | ea1013c1539270e372fc99854bc6e4d94eaeff66 (diff) | |
| download | linux-ec439c38013550420aecc15988ae6acb670838c1.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after 6.19-rc1
Cross-merge BPF and other fixes after downstream PR.
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'include/linux/socket.h')
| -rw-r--r-- | include/linux/socket.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/socket.h b/include/linux/socket.h index 944027f9765e..ec715ad4bf25 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -468,10 +468,10 @@ extern int __sys_connect(int fd, struct sockaddr __user *uservaddr, int addrlen); extern int __sys_listen(int fd, int backlog); extern int __sys_listen_socket(struct socket *sock, int backlog); +extern int do_getsockname(struct socket *sock, int peer, + struct sockaddr __user *usockaddr, int __user *usockaddr_len); extern int __sys_getsockname(int fd, struct sockaddr __user *usockaddr, - int __user *usockaddr_len); -extern int __sys_getpeername(int fd, struct sockaddr __user *usockaddr, - int __user *usockaddr_len); + int __user *usockaddr_len, int peer); extern int __sys_socketpair(int family, int type, int protocol, int __user *usockvec); extern int __sys_shutdown_sock(struct socket *sock, int how); |