diff options
| author | Chris Zankel <chris@zankel.net> | 2015-08-30 01:55:58 +0200 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2015-08-30 01:55:58 +0200 |
| commit | 650c919798c71fb34b77a6f2ba03a06907f06a76 (patch) | |
| tree | d1c60012d4d86846d25f1d0b783b5122c26a2e31 /include/net/ip.h | |
| parent | xtensa: improve vmlinux.lds.S sed post-processing (diff) | |
| parent | Linux 4.2 (diff) | |
| download | linux-650c919798c71fb34b77a6f2ba03a06907f06a76.tar.xz linux-650c919798c71fb34b77a6f2ba03a06907f06a76.zip | |
Merge tag 'v4.2' into for_next
Linux 4.2
Diffstat (limited to 'include/net/ip.h')
| -rw-r--r-- | include/net/ip.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/ip.h b/include/net/ip.h index 0750a186ea63..d5fe9f2ab699 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -161,6 +161,7 @@ static inline __u8 get_rtconn_flags(struct ipcm_cookie* ipc, struct sock* sk) } /* datagram.c */ +int __ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len); int ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len); void ip4_datagram_release_cb(struct sock *sk); |