Update to 3.1-rc9 kernel headers

Align header files with sanitized version of headers in kernel.

diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index 28a15ff2c87c0800fa0bf428b46b4ae2a8628343..19ee3750be2b0fe085cbc451b45ba632fc7e25e5 100644 (file)
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -78,10 +78,15 @@
                                         */
 #define ETH_P_PAE      0x888E          /* Port Access Entity (IEEE 802.1X) */
 #define ETH_P_AOE      0x88A2          /* ATA over Ethernet            */
+#define ETH_P_8021AD   0x88A8          /* 802.1ad Service VLAN         */
 #define ETH_P_TIPC     0x88CA          /* TIPC                         */
+#define ETH_P_8021AH   0x88E7          /* 802.1ah Backbone Service Tag */
 #define ETH_P_1588     0x88F7          /* IEEE 1588 Timesync */
 #define ETH_P_FCOE     0x8906          /* Fibre Channel over Ethernet  */
 #define ETH_P_FIP      0x8914          /* FCoE Initialization Protocol */
+#define ETH_P_QINQ1    0x9100          /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
+#define ETH_P_QINQ2    0x9200          /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
+#define ETH_P_QINQ3    0x9300          /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
 #define ETH_P_EDSA     0xDADA          /* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */
 
 /*

diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index dcf71830009f52bbb339746def9a45ef0d6bc8e8..86afe2b32565dffcc9f08182bfbee15a543515d4 100644 (file)
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -29,7 +29,7 @@
 #define MAX_LINKS 32           
 
 struct sockaddr_nl {
-       sa_family_t     nl_family;      /* AF_NETLINK   */
+       __kernel_sa_family_t    nl_family;      /* AF_NETLINK   */
        unsigned short  nl_pad;         /* zero         */
        __u32           nl_pid;         /* port ID      */
                __u32           nl_groups;      /* multicast groups mask */
@@ -49,6 +49,7 @@ struct nlmsghdr {
 #define NLM_F_MULTI            2       /* Multipart message, terminated by NLMSG_DONE */
 #define NLM_F_ACK              4       /* Reply with ack, with zero or error code */
 #define NLM_F_ECHO             8       /* Echo this request            */
+#define NLM_F_DUMP_INTR                16      /* Dump was inconsistent due to sequence change */
 
 /* Modifiers to GET request */
 #define NLM_F_ROOT     0x100   /* specify tree root    */

diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index a3ccbe43ab314493c529d596e005a1147e6dd1ed..12b19e65c83c2268033afe4344aebf2b5c3369fe 100644 (file)
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -583,6 +583,8 @@ enum rtnetlink_groups {
 #define RTNLGRP_PHONET_IFADDR  RTNLGRP_PHONET_IFADDR
        RTNLGRP_PHONET_ROUTE,
 #define RTNLGRP_PHONET_ROUTE   RTNLGRP_PHONET_ROUTE
+       RTNLGRP_DCB,
+#define RTNLGRP_DCB            RTNLGRP_DCB
        __RTNLGRP_MAX
 };
 #define RTNLGRP_MAX    (__RTNLGRP_MAX - 1)

diff --git a/include/linux/socket.h b/include/linux/socket.h
index 1057869e13e7675d0bb8c60f8ec7197b0c89bd4f..8c1e5017741d1e7dff44fcfe4d02c20f1851004e 100644 (file)
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -8,8 +8,10 @@
 #define _K_SS_ALIGNSIZE        (__alignof__ (struct sockaddr *))
                                /* Implementation specific desired alignment */
 
+typedef unsigned short __kernel_sa_family_t;
+
 struct __kernel_sockaddr_storage {
-       unsigned short  ss_family;              /* address family */
+       __kernel_sa_family_t    ss_family;              /* address family */
        /* Following field(s) are implementation specific */
        char            __data[_K_SS_MAXSIZE - sizeof(unsigned short)];
                                /* space to achieve desired size, */

diff --git a/include/linux/tc_ematch/tc_em_meta.h b/include/linux/tc_ematch/tc_em_meta.h
index 7138962664f81912b974c29c12900606ae07306a..b11f8ce2d3c0a7b055634d21440b8d22c3e3b1d6 100644 (file)
--- a/include/linux/tc_ematch/tc_em_meta.h
+++ b/include/linux/tc_ematch/tc_em_meta.h
@@ -67,7 +67,7 @@ enum {
        TCF_META_ID_SK_FORWARD_ALLOCS,
        TCF_META_ID_SK_SNDBUF,
        TCF_META_ID_SK_ALLOCS,
-       TCF_META_ID_SK_ROUTE_CAPS,
+       __TCF_META_ID_SK_ROUTE_CAPS,    /* unimplemented but in ABI already */
        TCF_META_ID_SK_HASH,
        TCF_META_ID_SK_LINGERTIME,
        TCF_META_ID_SK_ACK_BACKLOG,