update headers from pre 4.9 (net-next)

diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index b8486d142e722117c55cfc13f57a15f6a5be5fe7..d4a6e1f91728afc268e5de3fbd49f164e6c747e4 100644 (file)
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -419,6 +419,13 @@ enum bpf_func_id {
         */
        BPF_FUNC_csum_update,
 
+       /**
+        * bpf_set_hash_invalid(skb)
+        * Invalidate current skb>hash.
+        * @skb: pointer to skb
+        */
+       BPF_FUNC_set_hash_invalid,
+
        __BPF_FUNC_MAX_ID,
 };
 

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index b9299e33f45b0daafcd9daab001fad7bdd80ed02..20965c9a6dbc11fd0de994b682f3b9bdc9540a47 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -617,7 +617,7 @@ enum {
 enum {
        IFLA_VF_UNSPEC,
        IFLA_VF_MAC,            /* Hardware queue specific attributes */
-       IFLA_VF_VLAN,
+       IFLA_VF_VLAN,           /* VLAN ID and QoS */
        IFLA_VF_TX_RATE,        /* Max TX Bandwidth Allocation */
        IFLA_VF_SPOOFCHK,       /* Spoof Checking on/off switch */
        IFLA_VF_LINK_STATE,     /* link state enable/disable/auto switch */
@@ -629,6 +629,7 @@ enum {
        IFLA_VF_TRUST,          /* Trust VF */
        IFLA_VF_IB_NODE_GUID,   /* VF Infiniband node GUID */
        IFLA_VF_IB_PORT_GUID,   /* VF Infiniband port GUID */
+       IFLA_VF_VLAN_LIST,      /* nested list of vlans, option for QinQ */
        __IFLA_VF_MAX,
 };
 
@@ -645,6 +646,22 @@ struct ifla_vf_vlan {
        __u32 qos;
 };
 
+enum {
+       IFLA_VF_VLAN_INFO_UNSPEC,
+       IFLA_VF_VLAN_INFO,      /* VLAN ID, QoS and VLAN protocol */
+       __IFLA_VF_VLAN_INFO_MAX,
+};
+
+#define IFLA_VF_VLAN_INFO_MAX (__IFLA_VF_VLAN_INFO_MAX - 1)
+#define MAX_VLAN_LIST_LEN 1
+
+struct ifla_vf_vlan_info {
+       __u32 vf;
+       __u32 vlan; /* 0 - 4095, 0 disables VLAN filter */
+       __u32 qos;
+       __be16 vlan_proto; /* VLAN protocol either 802.1Q or 802.1ad */
+};
+
 struct ifla_vf_tx_rate {
        __u32 vf;
        __u32 rate; /* Max TX bandwidth in Mbps, 0 disables throttling */

diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
index 777150fe8177f98fb050cd4457763a0cb8d75fce..4f975f5704d8f71f22c96c9d28c468695b946aa7 100644 (file)
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
@@ -39,6 +39,7 @@
 #define GRE_IS_REC(f)          ((f) & GRE_REC)
 #define GRE_IS_ACK(f)          ((f) & GRE_ACK)
 
+#define GRE_VERSION_0          __cpu_to_be16(0x0000)
 #define GRE_VERSION_1          __cpu_to_be16(0x0001)
 #define GRE_PROTO_PPP          __cpu_to_be16(0x880b)
 #define GRE_PPTP_KEY_MASK      __cpu_to_be32(0xffff)

diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index 5e6e903ab803c69b4421cf3814cf7658cbcf62a5..b47ed3af22b694eab145180b3f957af05696a7e1 100644 (file)
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
@@ -342,6 +342,7 @@ enum {
        TCA_BPF_FD,
        TCA_BPF_NAME,
        TCA_BPF_FLAGS,
+       TCA_BPF_FLAGS_GEN,
        __TCA_BPF_MAX,
 };
 

diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h
index f8e39dbaa7815b2bd70c2dca1154771a09caae96..df7451d351311cd915fc96752fcaeb0a43b5d112 100644 (file)
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -811,7 +811,7 @@ struct tc_fq_qd_stats {
        __u32   flows;
        __u32   inactive_flows;
        __u32   throttled_flows;
-       __u32   pad;
+       __u32   unthrottle_latency_ns;
 };
 
 /* Heavy-Hitter Filter */

diff --git a/include/linux/tc_act/tc_vlan.h b/include/linux/tc_act/tc_vlan.h
index be72b6e3843b971e60ce6f5d1a924fe31242fa4b..bddb272b843f5a2e037de3c0820c3e7b28de569f 100644 (file)
--- a/include/linux/tc_act/tc_vlan.h
+++ b/include/linux/tc_act/tc_vlan.h
@@ -16,6 +16,7 @@
 
 #define TCA_VLAN_ACT_POP       1
 #define TCA_VLAN_ACT_PUSH      2
+#define TCA_VLAN_ACT_MODIFY    3
 
 struct tc_vlan {
        tc_gen;

diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
index d09be24e053ffcde4ce8c15deb71e858c5833831..d2dd1fd65e77a165a27911b09e2a3d995e0b359a 100644 (file)
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h
@@ -298,7 +298,7 @@ enum xfrm_attr_type_t {
        XFRMA_ALG_AUTH_TRUNC,   /* struct xfrm_algo_auth */
        XFRMA_MARK,             /* struct xfrm_mark */
        XFRMA_TFCPAD,           /* __u32 */
-       XFRMA_REPLAY_ESN_VAL,   /* struct xfrm_replay_esn */
+       XFRMA_REPLAY_ESN_VAL,   /* struct xfrm_replay_state_esn */
        XFRMA_SA_EXTRA_FLAGS,   /* __u32 */
        XFRMA_PROTO,            /* __u8 */
        XFRMA_ADDRESS_FILTER,   /* struct xfrm_address_filter */