Update headers to santized versions of 2.6.18

diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 24a38aeb85a29e070df7d5f4a58524b52f5ce27f..a4ad73720b9f2553d70fcba491b5519fd77d3b58 100644 (file)
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -5,7 +5,7 @@
 #include <linux/types.h>
 
 #define NETLINK_ROUTE          0       /* Routing/device hook                          */
-#define NETLINK_W1             1       /* 1-wire subsystem                             */
+#define NETLINK_UNUSED         1       /* Unused number                                */
 #define NETLINK_USERSOCK       2       /* Reserved for user mode socket protocols      */
 #define NETLINK_FIREWALL       3       /* Firewalling hook                             */
 #define NETLINK_INET_DIAG      4       /* INET socket monitoring                       */

diff --git a/include/linux/socket.h b/include/linux/socket.h
index b16548e0c7483d81e87e98287407495a1730fe34..33bfe70e4c02c504688dddd95a80304bae931bb7 100644 (file)
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -18,8 +18,6 @@ struct __kernel_sockaddr_storage {
 
 #if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
 
-#include <linux/config.h>              /* for CONFIG_COMPAT */
-#include <linux/linkage.h>
 #include <asm/socket.h>                        /* arch-dependent defines       */
 #include <linux/sockios.h>             /* the SIOCxxx I/O controls     */
 #include <linux/uio.h>                 /* iovec support                */

diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
index ea5b0423884e233de48e05d106df4515e1ce70cb..86c6f4493be3f335f127c33b30cc55373bbf7b26 100644 (file)
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h
@@ -118,6 +118,10 @@ enum
        XFRM_SHARE_UNIQUE       /* Use once */
 };
 
+#define XFRM_MODE_TRANSPORT 0
+#define XFRM_MODE_TUNNEL 1
+#define XFRM_MODE_MAX 2
+
 /* Netlink configuration messages.  */
 enum {
        XFRM_MSG_BASE = 0x10,