diff options
| author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-11-05 22:30:29 -0200 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-11-05 22:30:29 -0200 |
| commit | 2d43f1128a4282fbe8442f40b4cbbac05d8f10aa (patch) | |
| tree | 788e5a970c3efb090b73cef0de32aae25444b734 /include/linux | |
| parent | 6df716340da3a6fdd33d73d7ed4c6f7590ca1c42 (diff) | |
| parent | bdc450a0bb1d48144ced1f899cc8366ec8e85024 (diff) | |
| download | kernel_samsung_aries-2d43f1128a4282fbe8442f40b4cbbac05d8f10aa.zip kernel_samsung_aries-2d43f1128a4282fbe8442f40b4cbbac05d8f10aa.tar.gz kernel_samsung_aries-2d43f1128a4282fbe8442f40b4cbbac05d8f10aa.tar.bz2 | |
Merge branch 'red' of 84.73.165.173:/home/tgr/repos/net-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pkt_sched.h | 50 |
1 files changed, 24 insertions, 26 deletions
diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h index 60ffcb9..e87b233 100644 --- a/include/linux/pkt_sched.h +++ b/include/linux/pkt_sched.h @@ -93,6 +93,7 @@ struct tc_fifo_qopt /* PRIO section */ #define TCQ_PRIO_BANDS 16 +#define TCQ_MIN_PRIO_BANDS 2 struct tc_prio_qopt { @@ -169,6 +170,7 @@ struct tc_red_qopt unsigned char Scell_log; /* cell size for idle damping */ unsigned char flags; #define TC_RED_ECN 1 +#define TC_RED_HARDDROP 2 }; struct tc_red_xstats @@ -194,38 +196,34 @@ enum #define TCA_GRED_MAX (__TCA_GRED_MAX - 1) -#define TCA_SET_OFF TCA_GRED_PARMS struct tc_gred_qopt { - __u32 limit; /* HARD maximal queue length (bytes) -*/ - __u32 qth_min; /* Min average length threshold (bytes) -*/ - __u32 qth_max; /* Max average length threshold (bytes) -*/ - __u32 DP; /* upto 2^32 DPs */ - __u32 backlog; - __u32 qave; - __u32 forced; - __u32 early; - __u32 other; - __u32 pdrop; - - unsigned char Wlog; /* log(W) */ - unsigned char Plog; /* log(P_max/(qth_max-qth_min)) */ - unsigned char Scell_log; /* cell size for idle damping */ - __u8 prio; /* prio of this VQ */ - __u32 packets; - __u32 bytesin; + __u32 limit; /* HARD maximal queue length (bytes) */ + __u32 qth_min; /* Min average length threshold (bytes) */ + __u32 qth_max; /* Max average length threshold (bytes) */ + __u32 DP; /* upto 2^32 DPs */ + __u32 backlog; + __u32 qave; + __u32 forced; + __u32 early; + __u32 other; + __u32 pdrop; + __u8 Wlog; /* log(W) */ + __u8 Plog; /* log(P_max/(qth_max-qth_min)) */ + __u8 Scell_log; /* cell size for idle damping */ + __u8 prio; /* prio of this VQ */ + __u32 packets; + __u32 bytesin; }; + /* gred setup */ struct tc_gred_sopt { - __u32 DPs; - __u32 def_DP; - __u8 grio; - __u8 pad1; - __u16 pad2; + __u32 DPs; + __u32 def_DP; + __u8 grio; + __u8 flags; + __u16 pad1; }; /* HTB section */ |