diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2018-05-02 12:20:32 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2018-05-02 12:20:32 +0300 |
| commit | 53f071e19d566e7d0a4eada1bd8313a4cdb660a4 (patch) | |
| tree | ee2aecae90ec29ab404cf60bedeb3feb2ec99966 /include/net/inet_common.h | |
| parent | 043477b088d2af61a0937754c6560002237e6741 (diff) | |
| parent | 0ab390262c4920f26f8202063a268d5fc829728e (diff) | |
Merge drm/drm-next into drm-intel-next-queued
Need d224985a5e31 ("sched/wait, drivers/drm: Convert wait_on_atomic_t()
usage to the new wait_var_event() API") in dinq to be able to fix
https://bugs.freedesktop.org/show_bug.cgi?id=106085.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'include/net/inet_common.h')
| -rw-r--r-- | include/net/inet_common.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/net/inet_common.h b/include/net/inet_common.h index 5a54c9570977..384b90c62c0b 100644 --- a/include/net/inet_common.h +++ b/include/net/inet_common.h @@ -32,7 +32,9 @@ int inet_shutdown(struct socket *sock, int how); int inet_listen(struct socket *sock, int backlog); void inet_sock_destruct(struct sock *sk); int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len); -int inet_getname(struct socket *sock, struct sockaddr *uaddr, int *uaddr_len, +int __inet_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len, + bool force_bind_address_no_port, bool with_lock); +int inet_getname(struct socket *sock, struct sockaddr *uaddr, int peer); int inet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg); int inet_ctl_sock_create(struct sock **sk, unsigned short family, |