diff options
| author | Len Brown <len.brown@intel.com> | 2010-08-15 01:06:31 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-08-15 01:06:31 -0400 |
| commit | 95ee46aa8698f2000647dfb362400fadbb5807cf (patch) | |
| tree | e5a05c7297f997e191c73091934e42e3195c0e40 /include/net/inet_common.h | |
| parent | cfa806f059801dbe7e435745eb2e187c8bfe1e7f (diff) | |
| parent | 92fa5bd9a946b6e7aab6764e7312e4e3d9bed295 (diff) | |
Merge branch 'linus' into release
Conflicts:
drivers/acpi/debug.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/net/inet_common.h')
| -rw-r--r-- | include/net/inet_common.h | 59 |
1 files changed, 24 insertions, 35 deletions
diff --git a/include/net/inet_common.h b/include/net/inet_common.h index 18c773286b91..22fac9892b16 100644 --- a/include/net/inet_common.h +++ b/include/net/inet_common.h | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | #ifndef _INET_COMMON_H | 1 | #ifndef _INET_COMMON_H |
| 2 | #define _INET_COMMON_H | 2 | #define _INET_COMMON_H |
| 3 | 3 | ||
| 4 | extern const struct proto_ops inet_stream_ops; | 4 | extern const struct proto_ops inet_stream_ops; |
| 5 | extern const struct proto_ops inet_dgram_ops; | 5 | extern const struct proto_ops inet_dgram_ops; |
| 6 | 6 | ||
| 7 | /* | 7 | /* |
| 8 | * INET4 prototypes used by INET6 | 8 | * INET4 prototypes used by INET6 |
| @@ -13,37 +13,28 @@ struct sock; | |||
| 13 | struct sockaddr; | 13 | struct sockaddr; |
| 14 | struct socket; | 14 | struct socket; |
| 15 | 15 | ||
| 16 | extern int inet_release(struct socket *sock); | 16 | extern int inet_release(struct socket *sock); |
| 17 | extern int inet_stream_connect(struct socket *sock, | 17 | extern int inet_stream_connect(struct socket *sock, struct sockaddr * uaddr, |
| 18 | struct sockaddr * uaddr, | 18 | int addr_len, int flags); |
| 19 | int addr_len, int flags); | 19 | extern int inet_dgram_connect(struct socket *sock, struct sockaddr * uaddr, |
| 20 | extern int inet_dgram_connect(struct socket *sock, | 20 | int addr_len, int flags); |
| 21 | struct sockaddr * uaddr, | 21 | extern int inet_accept(struct socket *sock, struct socket *newsock, int flags); |
| 22 | int addr_len, int flags); | 22 | extern int inet_sendmsg(struct kiocb *iocb, struct socket *sock, |
| 23 | extern int inet_accept(struct socket *sock, | 23 | struct msghdr *msg, size_t size); |
| 24 | struct socket *newsock, int flags); | 24 | extern ssize_t inet_sendpage(struct socket *sock, struct page *page, int offset, |
| 25 | extern int inet_sendmsg(struct kiocb *iocb, | 25 | size_t size, int flags); |
| 26 | struct socket *sock, | 26 | extern int inet_recvmsg(struct kiocb *iocb, struct socket *sock, |
| 27 | struct msghdr *msg, | 27 | struct msghdr *msg, size_t size, int flags); |
| 28 | size_t size); | 28 | extern int inet_shutdown(struct socket *sock, int how); |
| 29 | extern int inet_shutdown(struct socket *sock, int how); | 29 | extern int inet_listen(struct socket *sock, int backlog); |
| 30 | extern int inet_listen(struct socket *sock, int backlog); | 30 | extern void inet_sock_destruct(struct sock *sk); |
| 31 | 31 | extern int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len); | |
| 32 | extern void inet_sock_destruct(struct sock *sk); | 32 | extern int inet_getname(struct socket *sock, struct sockaddr *uaddr, |
| 33 | 33 | int *uaddr_len, int peer); | |
| 34 | extern int inet_bind(struct socket *sock, | 34 | extern int inet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg); |
| 35 | struct sockaddr *uaddr, int addr_len); | 35 | extern int inet_ctl_sock_create(struct sock **sk, unsigned short family, |
| 36 | extern int inet_getname(struct socket *sock, | 36 | unsigned short type, unsigned char protocol, |
| 37 | struct sockaddr *uaddr, | 37 | struct net *net); |
| 38 | int *uaddr_len, int peer); | ||
| 39 | extern int inet_ioctl(struct socket *sock, | ||
| 40 | unsigned int cmd, unsigned long arg); | ||
| 41 | |||
| 42 | extern int inet_ctl_sock_create(struct sock **sk, | ||
| 43 | unsigned short family, | ||
| 44 | unsigned short type, | ||
| 45 | unsigned char protocol, | ||
| 46 | struct net *net); | ||
| 47 | 38 | ||
| 48 | static inline void inet_ctl_sock_destroy(struct sock *sk) | 39 | static inline void inet_ctl_sock_destroy(struct sock *sk) |
| 49 | { | 40 | { |
| @@ -51,5 +42,3 @@ static inline void inet_ctl_sock_destroy(struct sock *sk) | |||
| 51 | } | 42 | } |
| 52 | 43 | ||
| 53 | #endif | 44 | #endif |
| 54 | |||
| 55 | |||