Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

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

diff --git a/include/linux/net.h b/include/linux/net.h
index 91ab7ba..d421f7d 100644 (file)
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -18,9 +18,7 @@
 #ifndef _LINUX_NET_H
 #define _LINUX_NET_H
 
-#include <linux/config.h>
 #include <linux/wait.h>
-#include <linux/stringify.h>
 #include <asm/socket.h>
 
 struct poll_table_struct;
@@ -57,12 +55,14 @@ typedef enum {
 #define __SO_ACCEPTCON (1 << 16)       /* performed a listen           */
 
 #ifdef __KERNEL__
+#include <linux/stringify.h>
 
 #define SOCK_ASYNC_NOSPACE     0
 #define SOCK_ASYNC_WAITDATA    1
 #define SOCK_NOSPACE           2
 #define SOCK_PASSCRED          3
-#define SOCK_USER_SOCKET       4
+#define SOCK_PASSSEC           4
+#define SOCK_USER_SOCKET       5
 
 #ifndef ARCH_HAS_SOCKET_TYPES
 /**