sanitized headers update to 2.6.23-rc3

Update headers

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index f2238b7e5c66b2e1857bc1f18fa6d49391d422f2..23b3a8ef530ffb4bfc37ac01a7fd831697754e73 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -76,6 +76,8 @@ enum
 #define IFLA_WEIGHT IFLA_WEIGHT
        IFLA_OPERSTATE,
        IFLA_LINKMODE,
+       IFLA_LINKINFO,
+#define IFLA_LINKINFO IFLA_LINKINFO
        __IFLA_MAX
 };
 
@@ -138,4 +140,49 @@ struct ifla_cacheinfo
        __u32   retrans_time;
 };
 
+enum
+{
+       IFLA_INFO_UNSPEC,
+       IFLA_INFO_KIND,
+       IFLA_INFO_DATA,
+       IFLA_INFO_XSTATS,
+       __IFLA_INFO_MAX,
+};
+
+#define IFLA_INFO_MAX  (__IFLA_INFO_MAX - 1)
+
+/* VLAN section */
+
+enum
+{
+       IFLA_VLAN_UNSPEC,
+       IFLA_VLAN_ID,
+       IFLA_VLAN_FLAGS,
+       IFLA_VLAN_EGRESS_QOS,
+       IFLA_VLAN_INGRESS_QOS,
+       __IFLA_VLAN_MAX,
+};
+
+#define IFLA_VLAN_MAX  (__IFLA_VLAN_MAX - 1)
+
+struct ifla_vlan_flags {
+       __u32   flags;
+       __u32   mask;
+};
+
+enum
+{
+       IFLA_VLAN_QOS_UNSPEC,
+       IFLA_VLAN_QOS_MAPPING,
+       __IFLA_VLAN_QOS_MAX
+};
+
+#define IFLA_VLAN_QOS_MAX      (__IFLA_VLAN_QOS_MAX - 1)
+
+struct ifla_vlan_qos_mapping
+{
+       __u32 from;
+       __u32 to;
+};
+
 #endif /* _LINUX_IF_LINK_H */

diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h
index 00ab151896463bf8287b6ffd32352596fc9abc14..b83623321f64622300713da758d703126cc8a969 100644 (file)
--- a/include/linux/netfilter_ipv4/ip_tables.h
+++ b/include/linux/netfilter_ipv4/ip_tables.h
@@ -15,7 +15,6 @@
 #ifndef _IPTABLES_H
 #define _IPTABLES_H
 
-#include <linux/if.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 c3f01b3085a410ac9334fd993d8ee4cd38ed339e..30b8571e6b34c25b2311291ad460e2d1754e7862 100644 (file)
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
@@ -403,16 +403,13 @@ enum
  *   1..32767          Reserved for ematches inside kernel tree
  *   32768..65535      Free to use, not reliable
  */
-enum
-{
-       TCF_EM_CONTAINER,
-       TCF_EM_CMP,
-       TCF_EM_NBYTE,
-       TCF_EM_U32,
-       TCF_EM_META,
-       TCF_EM_TEXT,
-       __TCF_EM_MAX
-};
+#define        TCF_EM_CONTAINER        0
+#define        TCF_EM_CMP              1
+#define        TCF_EM_NBYTE            2
+#define        TCF_EM_U32              3
+#define        TCF_EM_META             4
+#define        TCF_EM_TEXT             5
+#define        TCF_EM_MAX              5
 
 enum
 {

diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h
index 4f1531bcfa567be6d4899de87f6350b7d8f3ff8f..268c51599eb8dc9343ffcdc6ef76e161858f6772 100644 (file)
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -103,9 +103,9 @@ struct tc_prio_qopt
 
 enum
 {
-        TCA_PRIO_UNSPEC,
-        TCA_PRIO_MQ,
-        __TCA_PRIO_MAX
+       TCA_PRIO_UNSPEC,
+       TCA_PRIO_MQ,
+       __TCA_PRIO_MAX
 };
 
 #define TCA_PRIO_MAX    (__TCA_PRIO_MAX - 1)

diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 477270c673f7b38fdc7e298accb1b8c4d0fa5f05..2611342d3463621fa56ddf76d90a2dd101a9c2dc 100644 (file)
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -261,9 +261,8 @@ enum rtattr_type_t
        RTA_FLOW,
        RTA_CACHEINFO,
        RTA_SESSION,
-       RTA_MP_ALGO,
+       RTA_MP_ALGO, /* no longer used */
        RTA_TABLE,
-       RTA_FWMASK,
        __RTA_MAX
 };
 

diff --git a/include/linux/socket.h b/include/linux/socket.h
index a391dfa648ad23fb2e5282ddfc29faf82b609a03..e07564f5b19967b4e2a08f497f7f5c740bb8eaf5 100644 (file)
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -250,6 +250,9 @@ struct ucred {
 
 #define MSG_EOF         MSG_FIN
 
+#define MSG_CMSG_CLOEXEC 0x40000000    /* Set close_on_exit for file
+                                          descriptor received through
+                                          SCM_RIGHTS */
 #if defined(CONFIG_COMPAT)
 #define MSG_CMSG_COMPAT        0x80000000      /* This message needs 32 bit fixups */
 #else
@@ -284,6 +287,7 @@ struct ucred {
 #define SOL_NETLINK    270
 #define SOL_TIPC       271
 #define SOL_RXRPC      272
+#define SOL_PPPOL2TP   273
 
 /* IPX options */
 #define IPX_TYPE       1