xen: fix incorrect vcpu_register_vcpu_info hypercall argument

[linux-2.6-omap-h63xx.git] / include / linux / net.h

diff --git a/include/linux/net.h b/include/linux/net.h
index 6f0dfeba509a40da8d0a724b52d0ac0c8c450219..c136abce7ef628291325c5ce00a49a1763db6101 100644 (file)
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -19,13 +19,13 @@
 #define _LINUX_NET_H
 
 #include <linux/wait.h>
-#include <linux/random.h>
 #include <asm/socket.h>
 
 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)                  */
@@ -57,6 +57,7 @@ typedef enum {
 
 #ifdef __KERNEL__
 #include <linux/stringify.h>
+#include <linux/random.h>
 
 #define SOCK_ASYNC_NOSPACE     0
 #define SOCK_ASYNC_WAITDATA    1
@@ -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;
 };