1 files changed, 17 insertions, 5 deletions

diff --git a/include/linux/net.h b/include/linux/net.h
index 71f7dd559285..4a9a30f2d68f 100644
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -20,6 +20,7 @@
 
 #include <linux/wait.h>
 #include <linux/socket.h>
+#include <linux/fcntl.h>        /* For O_CLOEXEC and O_NONBLOCK */
 #include <asm/socket.h>
 
 struct poll_table_struct;
@@ -46,6 +47,7 @@ struct net;
 #define SYS_GETSOCKOPT  15              /* sys_getsockopt(2)            */
 #define SYS_SENDMSG     16              /* sys_sendmsg(2)               */
 #define SYS_RECVMSG     17              /* sys_recvmsg(2)               */
+#define SYS_PACCEPT     18              /* sys_paccept(2)               */
 
 typedef enum {
         SS_FREE = 0,                    /* not allocated                */
@@ -94,6 +96,15 @@ enum sock_type {
 };
 
 #define SOCK_MAX (SOCK_PACKET + 1)
+/* Mask which covers at least up to SOCK_MASK-1.  The
+ * remaining bits are used as flags. */
+#define SOCK_TYPE_MASK 0xf
+
+/* Flags for socket, socketpair, paccept */
+#define SOCK_CLOEXEC    O_CLOEXEC
+#ifndef SOCK_NONBLOCK
+#define SOCK_NONBLOCK   O_NONBLOCK
+#endif
 
 #endif /* ARCH_HAS_SOCKET_TYPES */
 
@@ -106,23 +117,23 @@ enum sock_shutdown_cmd {
 /**
  *  struct socket - general BSD socket
  *  @state: socket state (%SS_CONNECTED, etc)
+ *  @type: socket type (%SOCK_STREAM, etc)
  *  @flags: socket flags (%SOCK_ASYNC_NOSPACE, etc)
  *  @ops: protocol specific socket operations
  *  @fasync_list: Asynchronous wake up list
  *  @file: File back pointer for gc
  *  @sk: internal networking protocol agnostic socket representation
  *  @wait: wait queue for several uses
- *  @type: socket type (%SOCK_STREAM, etc)
  */
 struct socket {
         socket_state            state;
+        short                   type;
         unsigned long           flags;
         const struct proto_ops  *ops;
         struct fasync_struct    *fasync_list;
         struct file             *file;
         struct sock             *sk;
         wait_queue_head_t       wait;
-        short                   type;
 };
 
 struct vm_area_struct;
@@ -208,10 +219,12 @@ extern int   	     sock_sendmsg(struct socket *sock, struct msghdr *msg,
                                   size_t len);
 extern int           sock_recvmsg(struct socket *sock, struct msghdr *msg,
                                   size_t size, int flags);
-extern int           sock_map_fd(struct socket *sock);
+extern int           sock_map_fd(struct socket *sock, int flags);
 extern struct socket *sockfd_lookup(int fd, int *err);
 #define              sockfd_put(sock) fput(sock->file)
 extern int           net_ratelimit(void);
+extern long          do_accept(int fd, struct sockaddr __user *upeer_sockaddr,
+                               int __user *upeer_addrlen, int flags);
 
 #define net_random()            random32()
 #define net_srandom(seed)       srandom32((__force u32)seed)
@@ -338,8 +351,7 @@ static const struct proto_ops name##_ops = {			\
 
 #ifdef CONFIG_SYSCTL
 #include <linux/sysctl.h>
-extern int net_msg_cost;
-extern int net_msg_burst;
+extern struct ratelimit_state net_ratelimit_state;
 #endif
 
 #endif /* __KERNEL__ */