Update to 3.13-rc6 + net-next headers

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index c6c93b95a646769a9ad397d182727d7c9d3273a2..7d8f543c13ea5b6417802273497b6134b9168060 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -347,11 +347,25 @@ enum {
        IFLA_BOND_MIN_LINKS,
        IFLA_BOND_LP_INTERVAL,
        IFLA_BOND_PACKETS_PER_SLAVE,
+       IFLA_BOND_AD_LACP_RATE,
+       IFLA_BOND_AD_SELECT,
+       IFLA_BOND_AD_INFO,
        __IFLA_BOND_MAX,
 };
 
 #define IFLA_BOND_MAX  (__IFLA_BOND_MAX - 1)
 
+enum {
+       IFLA_BOND_AD_INFO_AGGREGATOR,
+       IFLA_BOND_AD_INFO_NUM_PORTS,
+       IFLA_BOND_AD_INFO_ACTOR_KEY,
+       IFLA_BOND_AD_INFO_PARTNER_KEY,
+       IFLA_BOND_AD_INFO_PARTNER_MAC,
+       __IFLA_BOND_AD_INFO_MAX,
+};
+
+#define IFLA_BOND_AD_INFO_MAX  (__IFLA_BOND_AD_INFO_MAX - 1)
+
 /* SR-IOV virtual function management section */
 
 enum {

diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index f05c3d92eb12b8ae8ce802cab3ba49bf0586ef4f..be0bc18239919a27930d14e2f11e378f1a5a40b0 100644 (file)
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -51,6 +51,7 @@ enum nf_inet_hooks {
 
 enum {
        NFPROTO_UNSPEC =  0,
+       NFPROTO_INET   =  1,
        NFPROTO_IPV4   =  2,
        NFPROTO_ARP    =  3,
        NFPROTO_BRIDGE =  7,

diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h
index fe1192056fd167bd6bddc5adcf81f30257061a3a..d62316baae942c43b2558ed2768c88950516126c 100644 (file)
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -525,6 +525,7 @@ enum {
        TCA_NETEM_LOSS,
        TCA_NETEM_RATE,
        TCA_NETEM_ECN,
+       TCA_NETEM_RATE64,
        __TCA_NETEM_MAX,
 };
 
@@ -817,4 +818,29 @@ struct tc_hhf_xstats {
        __u32   hh_tot_count;   /* number of captured heavy-hitters so far */
        __u32   hh_cur_count;   /* number of current heavy-hitters */
 };
+
+/* PIE */
+enum {
+       TCA_PIE_UNSPEC,
+       TCA_PIE_TARGET,
+       TCA_PIE_LIMIT,
+       TCA_PIE_TUPDATE,
+       TCA_PIE_ALPHA,
+       TCA_PIE_BETA,
+       TCA_PIE_ECN,
+       TCA_PIE_BYTEMODE,
+       __TCA_PIE_MAX
+};
+#define TCA_PIE_MAX   (__TCA_PIE_MAX - 1)
+
+struct tc_pie_xstats {
+       __u32 prob;             /* current probability */
+       __u32 delay;            /* current delay in ms */
+       __u32 avg_dq_rate;      /* current average dq_rate in bits/pie_time */
+       __u32 packets_in;       /* total number of packets enqueued */
+       __u32 dropped;          /* packets dropped due to pie_action */
+       __u32 overlimit;        /* dropped due to lack of space in queue */
+       __u32 maxq;             /* maximum queue size */
+       __u32 ecn_mark;         /* packets marked with ecn*/
+};
 #endif