1 files changed, 41 insertions, 11 deletions

diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h
index 7281d5acf2f9..0d5b79365d03 100644
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -162,25 +162,44 @@ struct tc_sfq_qopt {
         unsigned        flows;          /* Maximal number of flows  */
 };
 
+struct tc_sfqred_stats {
+        __u32           prob_drop;      /* Early drops, below max threshold */
+        __u32           forced_drop;    /* Early drops, after max threshold */
+        __u32           prob_mark;      /* Marked packets, below max threshold */
+        __u32           forced_mark;    /* Marked packets, after max threshold */
+        __u32           prob_mark_head; /* Marked packets, below max threshold */
+        __u32           forced_mark_head;/* Marked packets, after max threshold */
+};
+
+struct tc_sfq_qopt_v1 {
+        struct tc_sfq_qopt v0;
+        unsigned int    depth;          /* max number of packets per flow */
+        unsigned int    headdrop;
+/* SFQRED parameters */
+        __u32           limit;          /* HARD maximal flow queue length (bytes) */
+        __u32           qth_min;        /* Min average length threshold (bytes) */
+        __u32           qth_max;        /* Max average length threshold (bytes) */
+        unsigned char   Wlog;           /* log(W)               */
+        unsigned char   Plog;           /* log(P_max/(qth_max-qth_min)) */
+        unsigned char   Scell_log;      /* cell size for idle damping */
+        unsigned char   flags;
+        __u32           max_P;          /* probability, high resolution */
+/* SFQRED stats */
+        struct tc_sfqred_stats stats;
+};
+
+
 struct tc_sfq_xstats {
         __s32           allot;
 };
 
-/*
- *  NOTE: limit, divisor and flows are hardwired to code at the moment.
- *
- *      limit=flows=128, divisor=1024;
- *
- *      The only reason for this is efficiency, it is possible
- *      to change these parameters in compile time.
- */
-
 /* RED section */
 
 enum {
         TCA_RED_UNSPEC,
         TCA_RED_PARMS,
         TCA_RED_STAB,
+        TCA_RED_MAX_P,
         __TCA_RED_MAX,
 };
 
@@ -194,8 +213,9 @@ struct tc_red_qopt {
         unsigned char   Plog;           /* log(P_max/(qth_max-qth_min)) */
         unsigned char   Scell_log;      /* cell size for idle damping */
         unsigned char   flags;
-#define TC_RED_ECN      1
-#define TC_RED_HARDDROP 2
+#define TC_RED_ECN              1
+#define TC_RED_HARDDROP         2
+#define TC_RED_ADAPTATIVE       4
 };
 
 struct tc_red_xstats {
@@ -214,6 +234,7 @@ enum {
        TCA_GRED_PARMS,
        TCA_GRED_STAB,
        TCA_GRED_DPS,
+       TCA_GRED_MAX_P,
            __TCA_GRED_MAX,
 };
 
@@ -253,6 +274,7 @@ enum {
         TCA_CHOKE_UNSPEC,
         TCA_CHOKE_PARMS,
         TCA_CHOKE_STAB,
+        TCA_CHOKE_MAX_P,
         __TCA_CHOKE_MAX,
 };
 
@@ -465,6 +487,7 @@ enum {
         TCA_NETEM_REORDER,
         TCA_NETEM_CORRUPT,
         TCA_NETEM_LOSS,
+        TCA_NETEM_RATE,
         __TCA_NETEM_MAX,
 };
 
@@ -495,6 +518,13 @@ struct tc_netem_corrupt {
         __u32   correlation;
 };
 
+struct tc_netem_rate {
+        __u32   rate;   /* byte/s */
+        __s32   packet_overhead;
+        __u32   cell_size;
+        __s32   cell_overhead;
+};
+
 enum {
         NETEM_LOSS_UNSPEC,
         NETEM_LOSS_GI,          /* General Intuitive - 4 state model */