From: Stephen Hemminger <stephen@networkplumber.org>
Date: Mon, 11 Apr 2016 20:44:50 +0000 (-0700)
Subject: update kernel headers
X-Git-Tag: v4.7.0~135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc9fb25788eb3a5e17df43d35ae4885471929ce7;p=thirdparty%2Fiproute2.git

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 0f5d6f549..3398b5de8 100644
--- 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 6a688e8c6..e296f2938 100644
--- 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 dafcb891a..901231e64 100644
--- 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,
 };