diff options
Diffstat (limited to 'include/linux/net.h')
| -rw-r--r-- | include/linux/net.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/include/linux/net.h b/include/linux/net.h index 17d83393afcc..738ea48be889 100644 --- a/include/linux/net.h +++ b/include/linux/net.h | |||
| @@ -120,7 +120,6 @@ struct socket { | |||
| 120 | 120 | ||
| 121 | struct vm_area_struct; | 121 | struct vm_area_struct; |
| 122 | struct page; | 122 | struct page; |
| 123 | struct kiocb; | ||
| 124 | struct sockaddr; | 123 | struct sockaddr; |
| 125 | struct msghdr; | 124 | struct msghdr; |
| 126 | struct module; | 125 | struct module; |
| @@ -162,8 +161,8 @@ struct proto_ops { | |||
| 162 | int (*compat_getsockopt)(struct socket *sock, int level, | 161 | int (*compat_getsockopt)(struct socket *sock, int level, |
| 163 | int optname, char __user *optval, int __user *optlen); | 162 | int optname, char __user *optval, int __user *optlen); |
| 164 | #endif | 163 | #endif |
| 165 | int (*sendmsg) (struct kiocb *iocb, struct socket *sock, | 164 | int (*sendmsg) (struct socket *sock, struct msghdr *m, |
| 166 | struct msghdr *m, size_t total_len); | 165 | size_t total_len); |
| 167 | /* Notes for implementing recvmsg: | 166 | /* Notes for implementing recvmsg: |
| 168 | * =============================== | 167 | * =============================== |
| 169 | * msg->msg_namelen should get updated by the recvmsg handlers | 168 | * msg->msg_namelen should get updated by the recvmsg handlers |
| @@ -172,9 +171,8 @@ struct proto_ops { | |||
| 172 | * handlers can assume that msg.msg_name is either NULL or has | 171 | * handlers can assume that msg.msg_name is either NULL or has |
| 173 | * a minimum size of sizeof(struct sockaddr_storage). | 172 | * a minimum size of sizeof(struct sockaddr_storage). |
| 174 | */ | 173 | */ |
| 175 | int (*recvmsg) (struct kiocb *iocb, struct socket *sock, | 174 | int (*recvmsg) (struct socket *sock, struct msghdr *m, |
| 176 | struct msghdr *m, size_t total_len, | 175 | size_t total_len, int flags); |
| 177 | int flags); | ||
| 178 | int (*mmap) (struct file *file, struct socket *sock, | 176 | int (*mmap) (struct file *file, struct socket *sock, |
| 179 | struct vm_area_struct * vma); | 177 | struct vm_area_struct * vma); |
| 180 | ssize_t (*sendpage) (struct socket *sock, struct page *page, | 178 | ssize_t (*sendpage) (struct socket *sock, struct page *page, |
| @@ -213,7 +211,7 @@ int sock_create(int family, int type, int proto, struct socket **res); | |||
| 213 | int sock_create_kern(int family, int type, int proto, struct socket **res); | 211 | int sock_create_kern(int family, int type, int proto, struct socket **res); |
| 214 | int sock_create_lite(int family, int type, int proto, struct socket **res); | 212 | int sock_create_lite(int family, int type, int proto, struct socket **res); |
| 215 | void sock_release(struct socket *sock); | 213 | void sock_release(struct socket *sock); |
| 216 | int sock_sendmsg(struct socket *sock, struct msghdr *msg, size_t len); | 214 | int sock_sendmsg(struct socket *sock, struct msghdr *msg); |
| 217 | int sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, | 215 | int sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, |
| 218 | int flags); | 216 | int flags); |
| 219 | struct file *sock_alloc_file(struct socket *sock, int flags, const char *dname); | 217 | struct file *sock_alloc_file(struct socket *sock, int flags, const char *dname); |
