Update headers to 2.6.27

diff --git a/include/linux/atm.h b/include/linux/atm.h
index 9846c8dde1cc47d723f142d393941a9d21e87189..6de1627034649594b206b61f1c512a00e81aa7e6 100644 (file)
--- a/include/linux/atm.h
+++ b/include/linux/atm.h
@@ -16,6 +16,7 @@
  * documentation. Do not change them.
  */
 
+
 #include <linux/atmapi.h>
 #include <linux/atmsap.h>
 #include <linux/atmioc.h>

diff --git a/include/linux/if.h b/include/linux/if.h
index 40eb61f93a3751964776befd1e8592e4e8397006..45d5b848e9dc48bc135d4e06337fe47d8c2cfdea 100644 (file)
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -21,6 +21,7 @@
 
 #include <linux/types.h>               /* for "__kernel_caddr_t" et al */
 #include <linux/socket.h>              /* for "struct sockaddr" et al  */
+               /* for "__user" et al           */
 
 #define        IFNAMSIZ        16
 #include <linux/hdlc/ioctl.h>
@@ -135,15 +136,15 @@ struct if_settings
        unsigned int size;      /* Size of the data allocated by the caller */
        union {
                /* {atm/eth/dsl}_settings anyone ? */
-               raw_hdlc_proto   *raw_hdlc;
-               cisco_proto      *cisco;
-               fr_proto         *fr;
-               fr_proto_pvc     *fr_pvc;
-               fr_proto_pvc_info *fr_pvc_info;
+               raw_hdlc_proto          *raw_hdlc;
+               cisco_proto             *cisco;
+               fr_proto                *fr;
+               fr_proto_pvc            *fr_pvc;
+               fr_proto_pvc_info       *fr_pvc_info;
 
                /* interface settings */
-               sync_serial_settings *sync;
-               te1_settings     *te1;
+               sync_serial_settings    *sync;
+               te1_settings            *te1;
        } ifs_ifsu;
 };
 

diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index 4014ba9337f442b066ca7e7534fb1bb57c612134..2dc4a57deb7e4dc7dd540652faef71bec467bf7b 100644 (file)
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -32,6 +32,7 @@ enum vlan_ioctl_cmds {
 
 enum vlan_flags {
        VLAN_FLAG_REORDER_HDR   = 0x1,
+       VLAN_FLAG_GVRP          = 0x2,
 };
 
 enum vlan_name_types {

diff --git a/include/linux/ip6_tunnel.h b/include/linux/ip6_tunnel.h
index af3f4a70f3df63ecb04c5bc69efa2013965553bf..1e7cc4af40deac588512e9715c77611c374b431c 100644 (file)
--- a/include/linux/ip6_tunnel.h
+++ b/include/linux/ip6_tunnel.h
@@ -1,7 +1,3 @@
-/*
- * $Id$
- */
-
 #ifndef _IP6_TUNNEL_H
 #define _IP6_TUNNEL_H
 

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

diff --git a/include/linux/netfilter_ipv4.h b/include/linux/netfilter_ipv4.h
index da7e16c712a658e9e78aa5291c494af692825850..4d7ba3e4b88f8822933b621edac2313255073e6e 100644 (file)
--- a/include/linux/netfilter_ipv4.h
+++ b/include/linux/netfilter_ipv4.h
@@ -58,6 +58,7 @@ enum nf_ip_hook_priorities {
        NF_IP_PRI_MANGLE = -150,
        NF_IP_PRI_NAT_DST = -100,
        NF_IP_PRI_FILTER = 0,
+       NF_IP_PRI_SECURITY = 50,
        NF_IP_PRI_NAT_SRC = 100,
        NF_IP_PRI_SELINUX_LAST = 225,
        NF_IP_PRI_CONNTRACK_CONFIRM = INT_MAX,

diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h
index c42c73f725eca6a8fc99042f2d2c6a1b7dee35f8..a9f21c9b3097317ef08d6b8b4d51568c362a6af6 100644 (file)
--- a/include/linux/netfilter_ipv4/ip_tables.h
+++ b/include/linux/netfilter_ipv4/ip_tables.h
@@ -16,6 +16,7 @@
 #define _IPTABLES_H
 
 #include <linux/types.h>
+
 #include <linux/netfilter_ipv4.h>
 
 #include <linux/netfilter/x_tables.h>

diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index 99efbed81fa2ed1b72a3594b4be1a3b3ada4e1b7..7cf7824df77814b327b1fb4abbd263273bd55bf4 100644 (file)
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
@@ -374,6 +374,7 @@ enum
        TCA_FLOW_ACT,
        TCA_FLOW_POLICE,
        TCA_FLOW_EMATCHES,
+       TCA_FLOW_PERTURB,
        __TCA_FLOW_MAX
 };
 

diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h
index dbb7ac37960d2a092d4250235aa3a37e5a97e61c..39dd604cb8f0c48f5c1d9cf31d5d898b09f14be9 100644 (file)
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -85,6 +85,26 @@ struct tc_ratespec
 
 #define TC_RTAB_SIZE   1024
 
+struct tc_sizespec {
+       unsigned char   cell_log;
+       unsigned char   size_log;
+       short           cell_align;
+       int             overhead;
+       unsigned int    linklayer;
+       unsigned int    mpu;
+       unsigned int    mtu;
+       unsigned int    tsize;
+};
+
+enum {
+       TCA_STAB_UNSPEC,
+       TCA_STAB_BASE,
+       TCA_STAB_DATA,
+       __TCA_STAB_MAX
+};
+
+#define TCA_STAB_MAX (__TCA_STAB_MAX - 1)
+
 /* FIFO section */
 
 struct tc_fifo_qopt
@@ -103,6 +123,7 @@ struct tc_prio_qopt
        __u8    priomap[TC_PRIO_MAX+1]; /* Map: logical priority -> PRIO band */
 };
 
+/* Obsolete option from original multiqueue */
 enum
 {
        TCA_PRIO_UNSPEC,

diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index c1f2d5022b4df7b6cd2a20040ec26ff2d3e764ec..a1256928399b299d07e9d8fb415ca7324de5e1e7 100644 (file)
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -482,6 +482,7 @@ enum
        TCA_RATE,
        TCA_FCNT,
        TCA_STATS2,
+       TCA_STAB,
        __TCA_MAX
 };
 

diff --git a/include/linux/socket.h b/include/linux/socket.h
index 0d4c15f2e24ef4120835dc3971f0da38801da205..b599cfcdf7a380672fb9022b84c61ffd38b109c2 100644 (file)
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -22,6 +22,7 @@ struct __kernel_sockaddr_storage {
 #include <linux/sockios.h>             /* the SIOCxxx I/O controls     */
 #include <linux/uio.h>                 /* iovec support                */
 #include <linux/types.h>               /* pid_t                        */
+               /*              */
 
 #ifdef CONFIG_PROC_FS
 struct seq_file;
@@ -186,7 +187,8 @@ struct ucred {
 #define AF_BLUETOOTH   31      /* Bluetooth sockets            */
 #define AF_IUCV                32      /* IUCV sockets                 */
 #define AF_RXRPC       33      /* RxRPC sockets                */
-#define AF_MAX         34      /* For now.. */
+#define AF_ISDN                34      /* mISDN sockets                */
+#define AF_MAX         35      /* For now.. */
 
 /* Protocol families, same as address families. */
 #define PF_UNSPEC      AF_UNSPEC
@@ -222,6 +224,7 @@ struct ucred {
 #define PF_BLUETOOTH   AF_BLUETOOTH
 #define PF_IUCV                AF_IUCV
 #define PF_RXRPC       AF_RXRPC
+#define PF_ISDN                AF_ISDN
 #define PF_MAX         AF_MAX
 
 /* Maximum queue length specifiable by listen.  */