update to net-next (4.3) headers

diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index 088091d1cb8c50aaa55de825fc38c7ba8d6ae9a7..3d6d00b72718d1b71b021f742ed0dcf2f924ca9a 100644 (file)
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -114,6 +114,7 @@ enum bpf_map_type {
        BPF_MAP_TYPE_HASH,
        BPF_MAP_TYPE_ARRAY,
        BPF_MAP_TYPE_PROG_ARRAY,
+       BPF_MAP_TYPE_PERF_EVENT_ARRAY,
 };
 
 enum bpf_prog_type {
@@ -270,6 +271,7 @@ enum bpf_func_id {
         */
        BPF_FUNC_skb_get_tunnel_key,
        BPF_FUNC_skb_set_tunnel_key,
+       BPF_FUNC_perf_event_read,       /* u64 bpf_perf_event_read(&map, index) */
        __BPF_FUNC_MAX_ID,
 };
 
@@ -290,6 +292,7 @@ struct __sk_buff {
        __u32 ifindex;
        __u32 tc_index;
        __u32 cb[5];
+       __u32 hash;
 };
 
 struct bpf_tunnel_key {

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index b905cf7f49486d774e11aceda6e2cbeac8f7915b..fa66d2bb33885e1b1c57b5d3f471def949a571f2 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -380,7 +380,6 @@ enum {
        IFLA_VXLAN_REMCSUM_RX,
        IFLA_VXLAN_GBP,
        IFLA_VXLAN_REMCSUM_NOPARTIAL,
-       IFLA_VXLAN_FLOWBASED,
        IFLA_VXLAN_COLLECT_METADATA,
        __IFLA_VXLAN_MAX
 };

diff --git a/include/linux/mpls.h b/include/linux/mpls.h
index 13c55eb8efd71de438b1c5f6f6e1219d4331b130..a14b54b5ccaf838bb06fa0179506903a429fb63d 100644 (file)
--- a/include/linux/mpls.h
+++ b/include/linux/mpls.h
@@ -41,4 +41,6 @@ struct mpls_label {
 #define MPLS_LABEL_OAMALERT            14 /* RFC3429 */
 #define MPLS_LABEL_EXTENSION           15 /* RFC7274 */
 
+#define MPLS_LABEL_FIRST_UNRESERVED    16 /* RFC3032 */
+
 #endif /* _MPLS_H */