Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[pandora-kernel.git] / include / linux / net.h

diff --git a/include/linux/net.h b/include/linux/net.h
index 6ab31ca..aa16731 100644 (file)
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -18,49 +18,13 @@
 #ifndef _LINUX_NET_H
 #define _LINUX_NET_H
 
-#include <linux/socket.h>
-#include <asm/socket.h>
-
-#define NPROTO         AF_MAX
-
-#define SYS_SOCKET     1               /* sys_socket(2)                */
-#define SYS_BIND       2               /* sys_bind(2)                  */
-#define SYS_CONNECT    3               /* sys_connect(2)               */
-#define SYS_LISTEN     4               /* sys_listen(2)                */
-#define SYS_ACCEPT     5               /* sys_accept(2)                */
-#define SYS_GETSOCKNAME        6               /* sys_getsockname(2)           */
-#define SYS_GETPEERNAME        7               /* sys_getpeername(2)           */
-#define SYS_SOCKETPAIR 8               /* sys_socketpair(2)            */
-#define SYS_SEND       9               /* sys_send(2)                  */
-#define SYS_RECV       10              /* sys_recv(2)                  */
-#define SYS_SENDTO     11              /* sys_sendto(2)                */
-#define SYS_RECVFROM   12              /* sys_recvfrom(2)              */
-#define SYS_SHUTDOWN   13              /* sys_shutdown(2)              */
-#define SYS_SETSOCKOPT 14              /* sys_setsockopt(2)            */
-#define SYS_GETSOCKOPT 15              /* sys_getsockopt(2)            */
-#define SYS_SENDMSG    16              /* sys_sendmsg(2)               */
-#define SYS_RECVMSG    17              /* sys_recvmsg(2)               */
-#define SYS_ACCEPT4    18              /* sys_accept4(2)               */
-#define SYS_RECVMMSG   19              /* sys_recvmmsg(2)              */
-#define SYS_SENDMMSG   20              /* sys_sendmmsg(2)              */
-
-typedef enum {
-       SS_FREE = 0,                    /* not allocated                */
-       SS_UNCONNECTED,                 /* unconnected to any socket    */
-       SS_CONNECTING,                  /* in process of connecting     */
-       SS_CONNECTED,                   /* connected to socket          */
-       SS_DISCONNECTING                /* in process of disconnecting  */
-} socket_state;
-
-#define __SO_ACCEPTCON (1 << 16)       /* performed a listen           */
-
-#ifdef __KERNEL__
 #include <linux/stringify.h>
 #include <linux/random.h>
 #include <linux/wait.h>
 #include <linux/fcntl.h>       /* For O_CLOEXEC and O_NONBLOCK */
 #include <linux/kmemcheck.h>
 #include <linux/rcupdate.h>
+#include <uapi/linux/net.h>
 
 struct poll_table_struct;
 struct pipe_inode_info;
@@ -319,5 +283,4 @@ extern int kernel_sock_shutdown(struct socket *sock,
 #define MODULE_ALIAS_NET_PF_PROTO_NAME(pf, proto, name) \
        MODULE_ALIAS("net-pf-" __stringify(pf) "-proto-" __stringify(proto) \
                     name)
-#endif /* __KERNEL__ */
 #endif /* _LINUX_NET_H */