update header files from 4.2 net-next

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index fa66d2bb33885e1b1c57b5d3f471def949a571f2..4f0a558e8fcf7165ae70fa9a3d91b9d749f29ec3 100644 (file)
--- 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 102ce7aab12efbf1f61c53d06dfc2c0cf960b3b7..f0201ca015c9d6452198198596f11beaaa3c88ee 100644 (file)
--- 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 2e35c61bbdd192eb08c8dbe787f179cd62b9aaad..788655bfa0f3001d549e90c8fe5dd811600e3a98 100644 (file)
--- 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 {