remove consolemap.h from header exports

[safe/jmp/linux-2.6] / include / linux / net.h

diff --git a/include/linux/net.h b/include/linux/net.h
index f28d8a2..c136abc 100644 (file)
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -23,8 +23,9 @@
 
 struct poll_table_struct;
 struct inode;
+struct net;
 
-#define NPROTO         32              /* should be enough for now..   */
+#define NPROTO         34              /* should be enough for now..   */
 
 #define SYS_SOCKET     1               /* sys_socket(2)                */
 #define SYS_BIND       2               /* sys_bind(2)                  */
@@ -169,7 +170,7 @@ struct proto_ops {
 
 struct net_proto_family {
        int             family;
-       int             (*create)(struct socket *sock, int protocol);
+       int             (*create)(struct net *net, struct socket *sock, int protocol);
        struct module   *owner;
 };