update to latest net-next headers

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 62c3dd1b45bf9305d06222c61137f52f0467876c..c6c93b95a646769a9ad397d182727d7c9d3273a2 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -342,6 +342,11 @@ enum {
        IFLA_BOND_FAIL_OVER_MAC,
        IFLA_BOND_XMIT_HASH_POLICY,
        IFLA_BOND_RESEND_IGMP,
+       IFLA_BOND_NUM_PEER_NOTIF,
+       IFLA_BOND_ALL_SLAVES_ACTIVE,
+       IFLA_BOND_MIN_LINKS,
+       IFLA_BOND_LP_INTERVAL,
+       IFLA_BOND_PACKETS_PER_SLAVE,
        __IFLA_BOND_MAX,
 };
 

diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h
index a806687ad98fc1258ae0b36c75164ecf5d59eec4..fe1192056fd167bd6bddc5adcf81f30257061a3a 100644 (file)
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -173,6 +173,8 @@ enum {
        TCA_TBF_PTAB,
        TCA_TBF_RATE64,
        TCA_TBF_PRATE64,
+       TCA_TBF_BURST,
+       TCA_TBF_PBURST,
        __TCA_TBF_MAX,
 };
 
@@ -790,4 +792,29 @@ struct tc_fq_qd_stats {
        __u32   throttled_flows;
        __u32   pad;
 };
+
+/* Heavy-Hitter Filter */
+
+enum {
+       TCA_HHF_UNSPEC,
+       TCA_HHF_BACKLOG_LIMIT,
+       TCA_HHF_QUANTUM,
+       TCA_HHF_HH_FLOWS_LIMIT,
+       TCA_HHF_RESET_TIMEOUT,
+       TCA_HHF_ADMIT_BYTES,
+       TCA_HHF_EVICT_TIMEOUT,
+       TCA_HHF_NON_HH_WEIGHT,
+       __TCA_HHF_MAX
+};
+
+#define TCA_HHF_MAX    (__TCA_HHF_MAX - 1)
+
+struct tc_hhf_xstats {
+       __u32   drop_overlimit; /* number of times max qdisc packet limit
+                                * was hit
+                                */
+       __u32   hh_overlimit;   /* number of times max heavy-hitters was hit */
+       __u32   hh_tot_count;   /* number of captured heavy-hitters so far */
+       __u32   hh_cur_count;   /* number of current heavy-hitters */
+};
 #endif