Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / include / net / inet_common.h

diff --git a/include/net/inet_common.h b/include/net/inet_common.h
index e305436..227adcb 100644 (file)
--- a/include/net/inet_common.h
+++ b/include/net/inet_common.h
@@ -1,13 +1,18 @@
 #ifndef _INET_COMMON_H
 #define _INET_COMMON_H
 
-extern struct proto_ops                inet_stream_ops;
-extern struct proto_ops                inet_dgram_ops;
+extern const struct proto_ops          inet_stream_ops;
+extern const struct proto_ops          inet_dgram_ops;
 
 /*
  *     INET4 prototypes used by INET6
  */
 
+struct msghdr;
+struct sock;
+struct sockaddr;
+struct socket;
+
 extern void                    inet_remove_sock(struct sock *sk1);
 extern void                    inet_put_sock(unsigned short num, 
                                              struct sock *sk);
@@ -20,29 +25,15 @@ 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;
 
 extern int                     inet_bind(struct socket *sock, 
                                          struct sockaddr *uaddr, int addr_len);