update kernel headers

Headers up to date with 4.6-net-next

diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index 0f5d6f5494db85c51ac05e0c86a25230bfb08e4b..3398b5de8305d32d2e267e96c0b90480302cdff9 100644 (file)
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -92,6 +92,7 @@ enum bpf_prog_type {
        BPF_PROG_TYPE_KPROBE,
        BPF_PROG_TYPE_SCHED_CLS,
        BPF_PROG_TYPE_SCHED_ACT,
+       BPF_PROG_TYPE_TRACEPOINT,
 };
 
 #define BPF_PSEUDO_MAP_FD      1

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 6a688e8c6fb4f0e071402d3adb852eac6c210c28..e296f2938fa8088034597cd2fb7f384bca8af508 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -486,6 +486,7 @@ enum {
        IFLA_VXLAN_REMCSUM_NOPARTIAL,
        IFLA_VXLAN_COLLECT_METADATA,
        IFLA_VXLAN_LABEL,
+       IFLA_VXLAN_GPE,
        __IFLA_VXLAN_MAX
 };
 #define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1)

diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
index dafcb891a5ea0fd9a2cd6f18262bbbdc325d6837..901231e64896382c879152040a5c7729df72d351 100644 (file)
--- a/include/linux/sock_diag.h
+++ b/include/linux/sock_diag.h
@@ -20,6 +20,7 @@ enum {
        SK_MEMINFO_WMEM_QUEUED,
        SK_MEMINFO_OPTMEM,
        SK_MEMINFO_BACKLOG,
+       SK_MEMINFO_DROPS,
 
        SK_MEMINFO_VARS,
 };