From: Stephen Hemminger <shemming@brocade.com>
Date: Wed, 12 Aug 2015 16:18:04 +0000 (-0700)
Subject: update header files from 4.2 net-next
X-Git-Tag: v4.3.0~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fcba79ed5be8c8ccd4f86eb290c0eb8c924b5ea;p=thirdparty%2Fiproute2.git

update header files from 4.2 net-next
---

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index fa66d2bb3..4f0a558e8 100644
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -228,6 +228,7 @@ enum {
 	IFLA_BR_AGEING_TIME,
 	IFLA_BR_STP_STATE,
 	IFLA_BR_PRIORITY,
+	IFLA_BR_VLAN_FILTERING,
 	__IFLA_BR_MAX,
 };
 
diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
index 102ce7aab..f0201ca01 100644
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
@@ -112,6 +112,7 @@ enum {
 	IFLA_GRE_ENCAP_FLAGS,
 	IFLA_GRE_ENCAP_SPORT,
 	IFLA_GRE_ENCAP_DPORT,
+	IFLA_GRE_COLLECT_METADATA,
 	__IFLA_GRE_MAX,
 };
 
diff --git a/include/linux/neighbour.h b/include/linux/neighbour.h
index 2e35c61bb..788655bfa 100644
--- a/include/linux/neighbour.h
+++ b/include/linux/neighbour.h
@@ -106,6 +106,7 @@ struct ndt_stats {
 	__u64		ndts_rcv_probes_ucast;
 	__u64		ndts_periodic_gc_runs;
 	__u64		ndts_forced_gc_runs;
+	__u64		ndts_table_fulls;
 };
 
 enum {