Update to 3.6.0-pre headers

These are pre -rc1 version of santised kernel headers

diff --git a/include/linux/if.h b/include/linux/if.h
index b3383a945d0bdddbc5f1f10164dd971c9468e739..7f261c08e8160db52b6d8993240392fcfa55502c 100644 (file)
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -81,6 +81,8 @@
 #define IFF_UNICAST_FLT        0x20000         /* Supports unicast filtering   */
 #define IFF_TEAM_PORT  0x40000         /* device used as team port */
 #define IFF_SUPP_NOFCS 0x80000         /* device supports sending custom FCS */
+#define IFF_LIVE_ADDR_CHANGE 0x100000  /* device supports hardware address
+                                        * change when it's running */
 
 
 #define IF_GET_IFACE   0x0001          /* for querying only */

diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index 8b35afea348a8b62df7aa9e922cd84f214cb88ce..9772d4e23bfaca8eb8cf4eed269995bb85559173 100644 (file)
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -105,7 +105,8 @@
 #define ETH_P_WAN_PPP   0x0007          /* Dummy type for WAN PPP frames*/
 #define ETH_P_PPP_MP    0x0008          /* Dummy type for PPP MP frames */
 #define ETH_P_LOCALTALK 0x0009         /* Localtalk pseudo type        */
-#define ETH_P_CAN      0x000C          /* Controller Area Network      */
+#define ETH_P_CAN      0x000C          /* CAN: Controller Area Network */
+#define ETH_P_CANFD    0x000D          /* CANFD: CAN flexible data rate*/
 #define ETH_P_PPPTALK  0x0010          /* Dummy type for Atalk over PPP*/
 #define ETH_P_TR_802_2 0x0011          /* 802.2 frames                 */
 #define ETH_P_MOBITEX  0x0015          /* Mobitex (kaz@cafe.net)       */

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 00e58688b5928c898cf80febe6679aafd356945a..46f03db3a4d137c037818d50ea8b4de10b4a2aaa 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -140,6 +140,8 @@ enum {
        IFLA_EXT_MASK,          /* Extended info mask, VFs, etc */
        IFLA_PROMISCUITY,       /* Promiscuity count: > 0 means acts PROMISC */
 #define IFLA_PROMISCUITY IFLA_PROMISCUITY
+       IFLA_NUM_TX_QUEUES,
+       IFLA_NUM_RX_QUEUES,
        __IFLA_MAX
 };
 

diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
index 8c819b8b357fd447e3f516f06f1ba2b883adb2c1..b501e6a564870a2cf5d15f6e50faded1e3eb9bfa 100644 (file)
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
@@ -76,4 +76,18 @@ enum {
 
 #define IFLA_GRE_MAX   (__IFLA_GRE_MAX - 1)
 
+/* VTI-mode i_flags */
+#define VTI_ISVTI 0x0001
+
+enum {
+       IFLA_VTI_UNSPEC,
+       IFLA_VTI_LINK,
+       IFLA_VTI_IKEY,
+       IFLA_VTI_OKEY,
+       IFLA_VTI_LOCAL,
+       IFLA_VTI_REMOTE,
+       __IFLA_VTI_MAX,
+};
+
+#define IFLA_VTI_MAX   (__IFLA_VTI_MAX - 1)
 #endif /* _IF_TUNNEL_H_ */

diff --git a/include/linux/netfilter_ipv4.h b/include/linux/netfilter_ipv4.h
index 549030940015fdee4e569407da9276c986c8480c..86658f6c0c4a5539e14b1f3c0e1ec13d76f5bd9b 100644 (file)
--- a/include/linux/netfilter_ipv4.h
+++ b/include/linux/netfilter_ipv4.h
@@ -64,6 +64,7 @@ enum nf_ip_hook_priorities {
        NF_IP_PRI_SECURITY = 50,
        NF_IP_PRI_NAT_SRC = 100,
        NF_IP_PRI_SELINUX_LAST = 225,
+       NF_IP_PRI_CONNTRACK_HELPER = 300,
        NF_IP_PRI_CONNTRACK_CONFIRM = INT_MAX,
        NF_IP_PRI_LAST = INT_MAX,
 };

diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index defbde203d0782034d23173063a9f7313d0b2e81..082eafaf026bea1a1afec4b873a3001880cead62 100644 (file)
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
@@ -451,8 +451,10 @@ enum {
 #define        TCF_EM_U32              3
 #define        TCF_EM_META             4
 #define        TCF_EM_TEXT             5
-#define        TCF_EM_VLAN             6
-#define        TCF_EM_MAX              6
+#define        TCF_EM_VLAN             6
+#define        TCF_EM_CANID            7
+#define        TCF_EM_IPSET            8
+#define        TCF_EM_MAX              8
 
 enum {
        TCF_EM_PROG_TC

diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
index 39e4b1c9a1136ec28b5ddec708b6a21340d471e5..ac9db193635553a1eca031c5b19ec81403152483 100644 (file)
--- a/include/linux/sock_diag.h
+++ b/include/linux/sock_diag.h
@@ -18,6 +18,7 @@ enum {
        SK_MEMINFO_FWD_ALLOC,
        SK_MEMINFO_WMEM_QUEUED,
        SK_MEMINFO_OPTMEM,
+       SK_MEMINFO_BACKLOG,
 
        SK_MEMINFO_VARS,
 };