From 4e0ea5614e9fcd95d30b9e94588fabc23f0e4f7f Mon Sep 17 00:00:00 2001 From: Toastman Date: Fri, 13 Jan 2012 16:30:04 +0700 Subject: [PATCH] fix outgoing QOS prios increase HTB prios to 10 change class prio assignment --- release/src-rt/linux/linux-2.6/include/linux/pkt_sched.h | 2 +- release/src/linux/linux/include/linux/pkt_sched.h | 2 +- release/src/router/rc/qos.c | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/release/src-rt/linux/linux-2.6/include/linux/pkt_sched.h b/release/src-rt/linux/linux-2.6/include/linux/pkt_sched.h index 827a216da7..e28dd880c8 100644 --- a/release/src-rt/linux/linux-2.6/include/linux/pkt_sched.h +++ b/release/src-rt/linux/linux-2.6/include/linux/pkt_sched.h @@ -256,7 +256,7 @@ struct tc_gred_sopt }; /* HTB section */ -#define TC_HTB_NUMPRIO 8 +#define TC_HTB_NUMPRIO 10 #define TC_HTB_MAXDEPTH 8 #define TC_HTB_PROTOVER 3 /* the same as HTB and TC's major */ diff --git a/release/src/linux/linux/include/linux/pkt_sched.h b/release/src/linux/linux/include/linux/pkt_sched.h index 7efba0e393..0c774042e3 100644 --- a/release/src/linux/linux/include/linux/pkt_sched.h +++ b/release/src/linux/linux/include/linux/pkt_sched.h @@ -280,7 +280,7 @@ struct tc_gred_sopt }; /* HTB section */ -#define TC_HTB_NUMPRIO 8 +#define TC_HTB_NUMPRIO 10 #define TC_HTB_MAXDEPTH 8 #define TC_HTB_PROTOVER 3 /* the same as HTB and TC's major */ diff --git a/release/src/router/rc/qos.c b/release/src/router/rc/qos.c index 32adc9c051..25601a0678 100644 --- a/release/src/router/rc/qos.c +++ b/release/src/router/rc/qos.c @@ -94,7 +94,7 @@ void ipt_qos(void) numeric (0:63) - dscp value afXX, csX, be, ef - dscp class class_prio: - 0-8 + 0-10 // Changed from 8 in pkt_sched.h - Toastman -1 = disabled */ @@ -433,7 +433,8 @@ void start_qos(void) "\t$TQA parent 1:%d handle %d: $Q\n" "\t$TFA parent 1: prio %d protocol ip handle %d fw flowid 1:%d\n", i, rate, ceil, - x, calc(bw, rate), s, burst_leaf, (i >= 6) ? 7 : (i + 1), mtu, +// x, calc(bw, rate), s, burst_leaf, (i >= 6) ? 7 : (i + 1), mtu, + x, calc(bw, rate), s, burst_leaf, i, mtu, //Toastman x, x, x, i + 1, x); } -- 2.11.4.GIT