update headers to 3.17.0 net-next

diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index fff062388af48d2962738f354a836fd6cfd87b5a..4678e499f419e758a065cf2d4b8f73a765aa6256 100644 (file)
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -128,6 +128,7 @@
 #define ETH_P_PHONET   0x00F5          /* Nokia Phonet frames          */
 #define ETH_P_IEEE802154 0x00F6                /* IEEE802.15.4 frame           */
 #define ETH_P_CAIF     0x00F7          /* ST-Ericsson CAIF protocol    */
+#define ETH_P_XDSA     0x00F8          /* Multiplexed DSA protocol     */
 
 /*
  *     This is an Ethernet frame header.

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 39cb62ce1e4d542bdfb9d5b78eadca281809992e..e9e6f03f87e9b6502b103bc0df2a7bbba5d11701 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -213,6 +213,18 @@ enum in6_addr_gen_mode {
        IN6_ADDR_GEN_MODE_NONE,
 };
 
+/* Bridge section */
+
+enum {
+       IFLA_BR_UNSPEC,
+       IFLA_BR_FORWARD_DELAY,
+       IFLA_BR_HELLO_TIME,
+       IFLA_BR_MAX_AGE,
+       __IFLA_BR_MAX,
+};
+
+#define IFLA_BR_MAX    (__IFLA_BR_MAX - 1)
+
 enum {
        BRIDGE_MODE_UNSPEC,
        BRIDGE_MODE_HAIRPIN,

diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
index 3e425f9d8abf14b993c92fb473f566f026b69a7d..32a754bd02e5e24d3b89467888ccf965677f7001 100644 (file)
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
@@ -53,10 +53,22 @@ enum {
        IFLA_IPTUN_6RD_RELAY_PREFIX,
        IFLA_IPTUN_6RD_PREFIXLEN,
        IFLA_IPTUN_6RD_RELAY_PREFIXLEN,
+       IFLA_IPTUN_ENCAP_TYPE,
+       IFLA_IPTUN_ENCAP_FLAGS,
+       IFLA_IPTUN_ENCAP_SPORT,
+       IFLA_IPTUN_ENCAP_DPORT,
        __IFLA_IPTUN_MAX,
 };
 #define IFLA_IPTUN_MAX (__IFLA_IPTUN_MAX - 1)
 
+enum tunnel_encap_types {
+       TUNNEL_ENCAP_NONE,
+       TUNNEL_ENCAP_FOU,
+};
+
+#define TUNNEL_ENCAP_FLAG_CSUM         (1<<0)
+#define TUNNEL_ENCAP_FLAG_CSUM6                (1<<1)
+
 /* SIT-mode i_flags */
 #define        SIT_ISATAP      0x0001
 
@@ -94,6 +106,10 @@ enum {
        IFLA_GRE_ENCAP_LIMIT,
        IFLA_GRE_FLOWINFO,
        IFLA_GRE_FLAGS,
+       IFLA_GRE_ENCAP_TYPE,
+       IFLA_GRE_ENCAP_FLAGS,
+       IFLA_GRE_ENCAP_SPORT,
+       IFLA_GRE_ENCAP_DPORT,
        __IFLA_GRE_MAX,
 };
 

diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
index fa2ecb2eb998b75332df9897a3753df3eff16902..3a1fd3299f2c193f163d73762b639afcf7c3d318 100644 (file)
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h
@@ -328,6 +328,8 @@ enum xfrm_spdattr_type_t {
        XFRMA_SPD_UNSPEC,
        XFRMA_SPD_INFO,
        XFRMA_SPD_HINFO,
+       XFRMA_SPD_IPV4_HTHRESH,
+       XFRMA_SPD_IPV6_HTHRESH,
        __XFRMA_SPD_MAX
 
 #define XFRMA_SPD_MAX (__XFRMA_SPD_MAX - 1)
@@ -347,6 +349,11 @@ struct xfrmu_spdhinfo {
        __u32 spdhmcnt;
 };
 
+struct xfrmu_spdhthresh {
+       __u8 lbits;
+       __u8 rbits;
+};
+
 struct xfrm_usersa_info {
        struct xfrm_selector            sel;
        struct xfrm_id                  id;