diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-06-26 21:26:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-06-26 21:26:05 -0700 |
| commit | 65d17d59059db7c8efff1a7fc2902612c51e42bb (patch) | |
| tree | 49f4667a86e7710332b0b36f050898f71d24d607 /include | |
| parent | b19738aea15fc1858ceb1180b2e334eaab12b06a (diff) | |
| parent | 4bddee2c398b538bd5871d3a57a99f06dc20e856 (diff) | |
Merge master.kernel.org:/home/davem/BK/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/inet_common.h | 13 | ||||
| -rw-r--r-- | include/net/sock.h | 13 |
2 files changed, 13 insertions, 13 deletions
diff --git a/include/net/inet_common.h b/include/net/inet_common.h index e30543604e2e..fbc1f4d140d8 100644 --- a/include/net/inet_common.h +++ b/include/net/inet_common.h @@ -20,27 +20,14 @@ extern int inet_dgram_connect(struct socket *sock, int addr_len, int flags); extern int inet_accept(struct socket *sock, struct socket *newsock, int flags); -extern int inet_recvmsg(struct kiocb *iocb, - struct socket *sock, - struct msghdr *ubuf, - size_t size, int flags); extern int inet_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, size_t size); extern int inet_shutdown(struct socket *sock, int how); extern unsigned int inet_poll(struct file * file, struct socket *sock, struct poll_table_struct *wait); -extern int inet_setsockopt(struct socket *sock, int level, - int optname, - char __user *optval, - int optlen); -extern int inet_getsockopt(struct socket *sock, int level, - int optname, - char __user *optval, - int __user *optlen); extern int inet_listen(struct socket *sock, int backlog); -extern void inet_sock_release(struct sock *sk); extern void inet_sock_destruct(struct sock *sk); extern atomic_t inet_sock_nr; diff --git a/include/net/sock.h b/include/net/sock.h index 9da91b9be903..c3277f3ecb20 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -771,6 +771,19 @@ extern ssize_t sock_no_sendpage(struct socket *sock, int flags); /* + * Functions to fill in entries in struct proto_ops when a protocol + * uses the inet style. + */ +extern int sock_common_getsockopt(struct socket *sock, int level, int optname, + char __user *optval, int __user *optlen); +extern int sock_common_recvmsg(struct kiocb *iocb, struct socket *sock, + struct msghdr *msg, size_t size, int flags); +extern int sock_common_setsockopt(struct socket *sock, int level, int optname, + char __user *optval, int optlen); + +extern void sk_common_release(struct sock *sk); + +/* * Default socket callbacks and setup code */ |