Update to 2.6.26-rc6 headers

Copy sanitized headers from 2.6.26-rc6

diff --git a/include/linux/atm.h b/include/linux/atm.h
index 593e6c10114562af732b470f6a93e5e221ae4169..9846c8dde1cc47d723f142d393941a9d21e87189 100644 (file)
--- a/include/linux/atm.h
+++ b/include/linux/atm.h
@@ -19,6 +19,7 @@
 #include <linux/atmapi.h>
 #include <linux/atmsap.h>
 #include <linux/atmioc.h>
+#include <linux/types.h>
 
 
 /* general ATM constants */
@@ -207,7 +208,7 @@ struct sockaddr_atmsvc {
         char           pub[ATM_E164_LEN+1]; /* public address (E.164) */
                                        /* unused addresses must be bzero'ed */
        char            lij_type;       /* role in LIJ call; one of ATM_LIJ* */
-       uint32_t        lij_id;         /* LIJ call identifier */
+       __u32   lij_id;         /* LIJ call identifier */
     } sas_addr __ATM_API_ALIGN;                /* SVC address */
 };
 

diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
index 228eb4eb31295aae0df29a9637e1bf416e086c62..d4efe40147056e6bc10bca8e1262bcfb569b68ee 100644 (file)
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
@@ -7,6 +7,10 @@
 #define SIOCADDTUNNEL   (SIOCDEVPRIVATE + 1)
 #define SIOCDELTUNNEL   (SIOCDEVPRIVATE + 2)
 #define SIOCCHGTUNNEL   (SIOCDEVPRIVATE + 3)
+#define SIOCGETPRL      (SIOCDEVPRIVATE + 4)
+#define SIOCADDPRL      (SIOCDEVPRIVATE + 5)
+#define SIOCDELPRL      (SIOCDEVPRIVATE + 6)
+#define SIOCCHGPRL      (SIOCDEVPRIVATE + 7)
 
 #define GRE_CSUM       __constant_htons(0x8000)
 #define GRE_ROUTING    __constant_htons(0x4000)
@@ -17,9 +21,6 @@
 #define GRE_FLAGS      __constant_htons(0x00F8)
 #define GRE_VERSION    __constant_htons(0x0007)
 
-/* i_flags values for SIT mode */
-#define        SIT_ISATAP      0x0001
-
 struct ip_tunnel_parm
 {
        char                    name[IFNAMSIZ];
@@ -31,4 +32,19 @@ struct ip_tunnel_parm
        struct iphdr            iph;
 };
 
+/* SIT-mode i_flags */
+#define        SIT_ISATAP      0x0001
+
+struct ip_tunnel_prl {
+       __be32                  addr;
+       __u16                   flags;
+       __u16                   __reserved;
+       __u32                   datalen;
+       __u32                   __reserved2;
+       /* data follows */
+};
+
+/* PRL flags */
+#define        PRL_DEFAULT             0x0001
+
 #endif /* _IF_TUNNEL_H_ */

diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index 4196a5115a806b639d15ef8703940bbe65a7531d..6ea935f70e0e072bf325667003fe230746f5fb95 100644 (file)
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -1,6 +1,7 @@
 #ifndef __LINUX_NETFILTER_H
 #define __LINUX_NETFILTER_H
 
+#include <linux/types.h>
 
 /* Responses from hook functions. */
 #define NF_DROP 0

diff --git a/include/linux/netfilter_ipv4.h b/include/linux/netfilter_ipv4.h
index 791e50ec5da05e387b9e46e7752689613a2caf63..da7e16c712a658e9e78aa5291c494af692825850 100644 (file)
--- a/include/linux/netfilter_ipv4.h
+++ b/include/linux/netfilter_ipv4.h
@@ -60,8 +60,6 @@ enum nf_ip_hook_priorities {
        NF_IP_PRI_FILTER = 0,
        NF_IP_PRI_NAT_SRC = 100,
        NF_IP_PRI_SELINUX_LAST = 225,
-       NF_IP_PRI_CONNTRACK_HELPER = INT_MAX - 2,
-       NF_IP_PRI_NAT_SEQ_ADJUST = INT_MAX - 1,
        NF_IP_PRI_CONNTRACK_CONFIRM = INT_MAX,
        NF_IP_PRI_LAST = INT_MAX,
 };

diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 3b90a9749c76b3fab0c69b6b22f2b89b113bd292..c1f2d5022b4df7b6cd2a20040ec26ff2d3e764ec 100644 (file)
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -246,6 +246,7 @@ enum rt_class_t
 {
        RT_TABLE_UNSPEC=0,
 /* User defined values */
+       RT_TABLE_COMPAT=252,
        RT_TABLE_DEFAULT=253,
        RT_TABLE_MAIN=254,
        RT_TABLE_LOCAL=255,
@@ -267,10 +268,10 @@ enum rtattr_type_t
        RTA_PREFSRC,
        RTA_METRICS,
        RTA_MULTIPATH,
-       RTA_PROTOINFO,
+       RTA_PROTOINFO, /* no longer used */
        RTA_FLOW,
        RTA_CACHEINFO,
-       RTA_SESSION,
+       RTA_SESSION, /* no longer used */
        RTA_MP_ALGO, /* no longer used */
        RTA_TABLE,
        __RTA_MAX

diff --git a/include/linux/types.h b/include/linux/types.h
index d9e8c4f2ad8fd80b4ac2e77548b621b87cc87ced..d17027a9ef9fecde7b21ac051c0322c89fb3828b 100644 (file)
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -162,11 +162,4 @@ typedef __u16 __bitwise __sum16;
 typedef __u32 __bitwise __wsum;
 
 
-struct ustat {
-       __kernel_daddr_t        f_tfree;
-       __kernel_ino_t          f_tinode;
-       char                    f_fname[6];
-       char                    f_fpack[6];
-};
-
 #endif /* _LINUX_TYPES_H */

diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
index 05adf0f2a2860c724b9c3361cfcd307d45ebd226..132ba876194154c93a2c10d072d8880c01c2a54a 100644 (file)
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h
@@ -97,10 +97,10 @@ struct xfrm_algo {
 };
 
 struct xfrm_algo_aead {
-       char    alg_name[64];
-       int     alg_key_len;    /* in bits */
-       int     alg_icv_len;    /* in bits */
-       char    alg_key[0];
+       char            alg_name[64];
+       unsigned int    alg_key_len;    /* in bits */
+       unsigned int    alg_icv_len;    /* in bits */
+       char            alg_key[0];
 };
 
 struct xfrm_stats {
@@ -113,7 +113,8 @@ enum
 {
        XFRM_POLICY_TYPE_MAIN   = 0,
        XFRM_POLICY_TYPE_SUB    = 1,
-       XFRM_POLICY_TYPE_MAX    = 2
+       XFRM_POLICY_TYPE_MAX    = 2,
+       XFRM_POLICY_TYPE_ANY    = 255
 };
 
 enum